@wowok/agent-mcp 2.3.13 → 2.3.16

package/dist/index.js

@@ -5,9 +5,86 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { readFileSync } from "fs";
 import { resolve } from "path";
 const packageJson = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf-8"));
-import { MachineNode2File_InputSchema, MachineNode2File_OutputWrappedSchema, Guard2File_InputSchema, Guard2File_OutputWrappedSchema, strictParse, CallOutputSchema, handleCallResult, createServerConfig, createCapabilitiesConfig, createToolMeta, transformSubmission, getEnvConfig, OnchainEventsInputSchema, OnchainEventsResultSchema, ProtocolInfoQuerySchema, ProtocolInfoResultSchema, AccountOperationOutputWrappedSchema, LocalMarkOperationOutputWrappedSchema, LocalInfoOperationOutputWrappedSchema, WipOperationOutputSchema, MessengerOperationOutputSchema, AccountOperationSchema, LocalMarkOperationSchema, LocalInfoOperationSchema, parseMachineNodesFromText, formatNodeErrors as formatMachineNodeErrors, MessengerOperationInputSchema, BridgeOperationsSchema, BridgeCallOutputSchema, OnchainOperationsSchema, WipOperationsSchema, OnchainTableDataSchema, OnchainTableDataResultSchema, WatchQueryOperationsSchema, } from "./schema/index.js";
+import { MachineNode2File_InputSchema, MachineNode2File_OutputWrappedSchema, Guard2File_InputSchema, Guard2File_OutputWrappedSchema, strictParse, CallOutputSchema, handleCallResult, createServerConfig, createCapabilitiesConfig, createToolMeta, transformSubmission, getEnvConfig, OnchainEventsInputSchema, OnchainEventsResultSchema, ProtocolInfoQuerySchema, ProtocolInfoResultSchema, AccountOperationOutputWrappedSchema, LocalMarkOperationOutputWrappedSchema, LocalInfoOperationOutputWrappedSchema, WipOperationOutputSchema, MessengerOperationOutputSchema, AccountOperationSchema, LocalMarkOperationSchema, LocalInfoOperationSchema, parseMachineNodesFromText, formatNodeErrors as formatMachineNodeErrors, MessengerOperationInputSchema, BridgeOperationsSchema, BridgeCallOutputSchema, OnchainOperationsSchema, WipOperationsSchema, OnchainTableDataSchema, OnchainTableDataResultSchema, WatchQueryOperationsSchema, registerSuccessHook, } from "./schema/index.js";
 import { handleBridgeOperations } from "./schema/call/bridge-handler.js";
-import { CallService, CallMachine, CallProgress, CallPermission, CallGuard, CallArbitration, CallRepository, CallContact, CallTreasury, CallReward, CallAllocation, CallPersonal, CallPayment, CallDemand, CallOrder, gen_passport, guard2file, parseGuardFile, formatGuardParseErrors, machineNode2file, generateNodeComments, generate_wip, verify_wip, sign_wip, wip2html, account_operation, local_mark_operation, local_info_operation, watch_conversations, send_message, send_file, watch_messages, extract_zip_messages, generate_wts, verify_wts, sign_wts, wts2html, proof_message, mark_messages_as_viewed, mark_conversation_as_viewed, query_local_mark_list, query_account_list, query_local_info_list, query_local_token_list, query_account, GetLocalNamesByAddresses, query_personal, query_objects, query_table, query_tableItem, queryProtocolInfo, query_received, queryTableItem_RepositoryData, queryTableItem_PermissionPerm, queryTableItem_RewardRecord, queryTableItem_DemandPresenter, queryTableItem_TreasuryHistory, queryTableItem_MachineNode, queryTableItem_ProgressHistory, queryTableItem_AddressMark, queryTableItem_EntityRegistrar, queryTableItem_EntityLinker, query_events, blacklist, friendslist, guardlist, settings, AmountType, } from "@wowok/wowok";
+import { buildDataSemantic, classifyError } from "./schema/call/semantic.js";
+import { getHarness } from "./harness/index.js";
+import { confirmGate } from "./safety/confirm-gate.js";
+import { renderPreview } from "./safety/preview.js";
+import { isProjectServiceEnabled, normalize as projectNormalize, observe as projectObserve, queryProjects, queryProjectObjects, queryShareableObjects, queryDependencies, queryReferencedBy, queryPrePublishCheck, queryCrossProjectReferences, queryGraphStats, saveGraph, loadGraph, } from "./project/index.js";
+import { isEnabled as isRuntimeEnabled, listServices, getServiceInfo, toggle as toggleService, setEnabled as setServiceEnabled, reset as resetService, } from "./config/index.js";
+import { validateOperation, hasBlockingViolations, getWarningViolations, } from "./knowledge/index.js";
+const HARNESS_ENABLED = () => isRuntimeEnabled("harness");
+function withHarness(base, operation, intent) {
+    if (!HARNESS_ENABLED())
+        return base;
+    try {
+        const harness = getHarness();
+        const expected = harness.expect(operation, intent, base.operation_type, base.data);
+        return {
+            ...base,
+            harness,
+            expected,
+            operation_id: `${base.operation_type}_${Date.now()}`,
+        };
+    }
+    catch {
+        return base;
+    }
+}
+function buildPendingConfirmation(operation_type, data, env) {
+    const gate = confirmGate(operation_type, data, env, env?.user_intent_phrases);
+    if (gate.pass)
+        return { content: [], structuredContent: null };
+    const preview = gate.preview;
+    const rendered = renderPreview(preview);
+    const output = {
+        message: rendered,
+        result: {
+            type: "pending_confirmation",
+            preview,
+            rule_id: gate.rule_id,
+        },
+        semantic: {
+            intent: `${operation_type}_awaiting_confirmation`,
+            status: "pending_input",
+            summary: `Operation blocked by ConfirmGate (${gate.level}). Review the preview and re-call with env.confirmed=true to proceed.`,
+            next_actions: [
+                {
+                    action: "confirm: re-call the SAME operation with env.confirmed=true",
+                    reason: `ConfirmGate rule '${gate.rule_id}' matched. The operation was NOT executed.`,
+                    tool: "onchain_operations",
+                    priority: "required",
+                },
+            ],
+            warnings: preview.warnings ?? [],
+        },
+    };
+    return {
+        content: [{ type: "text", text: rendered }],
+        structuredContent: output,
+    };
+}
+function buildConstraintError(operation_type, violations) {
+    const errors = violations.filter((v) => v.severity === "error");
+    const errorList = errors.map((v) => `  • [${v.field}] ${v.message}`).join("\n");
+    const message = `Pre-call constraint violations for '${operation_type}':\n${errorList}\n\nFix the listed field(s) and retry.`;
+    const output = {
+        message,
+        result: {
+            type: "error",
+            error: message,
+            error_code: "invalid_parameter",
+            retryable: false,
+            recovery_hint: "Review the constraint violations above and correct the corresponding fields.",
+        },
+    };
+    return {
+        content: [{ type: "text", text: message }],
+        structuredContent: output,
+    };
+}
+import { CallService, CallMachine, CallProgress, CallPermission, CallGuard, CallArbitration, CallRepository, CallContact, CallTreasury, CallReward, CallAllocation, CallPersonal, CallPayment, CallDemand, CallOrder, gen_passport, CallProof, gen_proof, guard2file, parseGuardFile, formatGuardParseErrors, machineNode2file, generateNodeComments, generate_wip, verify_wip, sign_wip, wip2html, account_operation, local_mark_operation, local_info_operation, watch_conversations, send_message, send_file, watch_messages, extract_zip_messages, pull_messages, generate_wts, verify_wts, sign_wts, wts2html, proof_message, mark_messages_as_viewed, mark_conversation_as_viewed, query_local_mark_list, query_account_list, query_local_info_list, query_local_token_list, query_account, GetLocalNamesByAddresses, query_personal, query_objects, query_table, query_tableItem, queryProtocolInfo, query_received, queryTableItem_RepositoryData, queryTableItem_PermissionPerm, queryTableItem_RewardRecord, queryTableItem_DemandPresenter, queryTableItem_TreasuryHistory, queryTableItem_MachineNode, queryTableItem_ProgressHistory, queryTableItem_AddressMark, queryTableItem_EntityRegistrar, queryTableItem_EntityLinker, query_events, blacklist, friendslist, guardlist, settings, AmountType, } from "@wowok/wowok";
 import { areSchemasAvailable, getSchemaIndex, processSchemaQuery, } from "./schema-query/index.js";
 const SERVER_DESCRIPTION = `WoWok MCP Server - Making It Easy for AI Agents to Communicate, Collaborate, Trade, and Trust.
 
@@ -117,6 +194,78 @@ Token amounts are HIGHLY SENSITIVE. Always:
 - machineNode2file
 `;
 const server = new McpServer(createServerConfig(packageJson, SERVER_DESCRIPTION), createCapabilitiesConfig());
+import { withTelemetry, setTelemetryEnabled } from "./telemetry/index.js";
+if (process.env.WOWOK_TELEMETRY === "false" || process.env.WOWOK_TELEMETRY === "0") {
+    setTelemetryEnabled(false);
+}
+function buildClassifiedErrorResult(base, error, classified) {
+    const result = { ...base, error };
+    if (classified.error_code !== undefined)
+        result.error_code = classified.error_code;
+    if (classified.retryable !== undefined)
+        result.retryable = classified.retryable;
+    if (classified.recovery_hint !== undefined)
+        result.recovery_hint = classified.recovery_hint;
+    return result;
+}
+const statusErrorShape = (error, classified, ctx) => ({
+    result: buildClassifiedErrorResult({ status: "error" }, error, classified),
+    semantic: buildDataSemantic(undefined, ctx, true, error),
+});
+const operationErrorShape = (error, classified, ctx) => ({
+    result: buildClassifiedErrorResult({ operation: "error" }, error, classified),
+    semantic: buildDataSemantic(undefined, ctx, true, error),
+});
+const strictStatusErrorShape = (error, _classified, _ctx) => ({
+    result: { status: "error", error },
+});
+function reg(name, config, handler, errorShapeBuilder, customTimeoutMs) {
+    const timeoutMs = customTimeoutMs ?? 60000;
+    const wrappedHandler = wrapHandlerWithErrorShape(handler, timeoutMs, name, errorShapeBuilder);
+    server.registerTool(name, config, withTelemetry(name, wrappedHandler));
+}
+function withTimeout(promise, timeoutMs = 30000, operationName = "operation") {
+    let timer;
+    return Promise.race([
+        promise.finally(() => {
+            if (timer)
+                clearTimeout(timer);
+        }),
+        new Promise((_, reject) => {
+            timer = setTimeout(() => {
+                let hint = "";
+                if (operationName.includes("messenger")) {
+                    hint = " This is a messenger network operation. Possible causes: " +
+                        "(1) messenger server (https://messenger.wowok.net) unreachable, " +
+                        "(2) no messenger-enabled account configured (use account_operation to set messenger name), " +
+                        "(3) network connectivity issue. " +
+                        "Ensure you have a messenger-enabled account and the server is reachable.";
+                }
+                reject(new Error(`Operation '${operationName}' timed out after ${timeoutMs}ms.${hint}`));
+            }, timeoutMs);
+        }),
+    ]);
+}
+function wrapHandlerWithErrorShape(handler, timeoutMs, toolName, errorShapeBuilder) {
+    return async (args) => {
+        try {
+            return await withTimeout(handler(args), timeoutMs, toolName);
+        }
+        catch (error) {
+            if (errorShapeBuilder) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                const classified = classifyError(errorMessage);
+                const ctx = { operation_type: toolName, data: args };
+                const structuredContent = errorShapeBuilder(errorMessage, classified, ctx);
+                return {
+                    content: [{ type: "text", text: `Error: ${errorMessage}` }],
+                    structuredContent,
+                };
+            }
+            throw error;
+        }
+    };
+}
 function convertAmountType(type) {
     if (typeof type === "number")
         return type;
@@ -223,10 +372,18 @@ async function handleOnchainTableData(args) {
     }
     return {
         content: [{ type: "text", text: JSON.stringify({ result }) }],
-        structuredContent: { result },
+        structuredContent: {
+            result,
+            semantic: buildDataSemantic(result, {
+                operation_type: "onchain_table_data",
+                data: validated,
+            }),
+        },
     };
 }
 async function handleOnchainOperations(args) {
+    let validated;
+    let constraintWarnings = [];
     try {
         if (typeof args === 'object' && args !== null && args.description && !args.operation_type) {
             const hasWrappedParams = typeof args.description === 'string' &&
@@ -237,15 +394,40 @@ async function handleOnchainOperations(args) {
                     "Incorrect format: { description: '{ operation_type: ... }' }");
             }
         }
-        const validated = strictParse(OnchainOperationsSchema, args, "onchain_operations input");
+        validated = strictParse(OnchainOperationsSchema, args, "onchain_operations input");
         const env = getEnvConfig(validated.env);
+        const gateResult = buildPendingConfirmation(validated.operation_type, validated.data, env);
+        if (gateResult.structuredContent) {
+            return gateResult;
+        }
+        const constraintViolations = validateOperation(validated.operation_type, validated.data);
+        if (hasBlockingViolations(constraintViolations)) {
+            return buildConstraintError(validated.operation_type, constraintViolations);
+        }
+        constraintWarnings = getWarningViolations(constraintViolations).map((v) => `[PRE-CHECK] ${v.message}`);
+        const projectEnvPrefix = env?.project;
+        if (isProjectServiceEnabled()) {
+            const pn = projectNormalize({
+                operation_type: validated.operation_type,
+                data: validated.data,
+                projectPrefix: projectEnvPrefix,
+            });
+            validated.data = pn.data;
+        }
+        if (env && typeof env === "object") {
+            delete env.confirmed;
+            delete env.user_intent_phrases;
+            delete env.project;
+        }
         switch (validated.operation_type) {
             case "service": {
                 const callService = new CallService(validated.data);
                 const result = validated.submission
                     ? await callService.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callService.call(env);
-                return handleCallResult(result);
+                const data = validated.data;
+                const intent = data?.publish ? "publish service" : data?.bPublished !== undefined ? "modify service" : "create service";
+                return handleCallResult(result, withHarness({ operation_type: validated.operation_type, data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined }, "service", intent));
             }
             case "machine": {
                 if (validated.data.node && typeof validated.data.node === 'object' && 'json_or_markdown_file' in validated.data.node) {
@@ -276,42 +458,42 @@ async function handleOnchainOperations(args) {
                 const result = validated.submission
                     ? await callMachine.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callMachine.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "progress": {
                 const callProgress = new CallProgress(validated.data);
                 const result = validated.submission
                     ? await callProgress.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callProgress.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "repository": {
                 const callRepository = new CallRepository(validated.data);
                 const result = validated.submission
                     ? await callRepository.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callRepository.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "arbitration": {
                 const callArbitration = new CallArbitration(validated.data);
                 const result = validated.submission
                     ? await callArbitration.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callArbitration.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "contact": {
                 const callContact = new CallContact(validated.data);
                 const result = validated.submission
                     ? await callContact.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callContact.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "treasury": {
                 const callTreasury = new CallTreasury(validated.data);
                 const result = validated.submission
                     ? await callTreasury.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callTreasury.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "reward": {
                 const transformedData = transformRewardData(validated.data);
@@ -319,19 +501,19 @@ async function handleOnchainOperations(args) {
                 const result = validated.submission
                     ? await callReward.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callReward.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "allocation": {
                 const callAllocation = new CallAllocation(validated.data);
                 const result = validated.submission
                     ? await callAllocation.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callAllocation.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "permission": {
                 const callPermission = new CallPermission(validated.data);
                 const result = await callPermission.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "guard": {
                 const validatedData = validated.data;
@@ -378,7 +560,7 @@ async function handleOnchainOperations(args) {
                 }
                 const callGuard = new CallGuard(validatedData);
                 const result = await callGuard.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "personal": {
                 const transformPersonalData = (data) => {
@@ -431,52 +613,56 @@ async function handleOnchainOperations(args) {
                 const transformedData = transformPersonalData(validated.data);
                 const callPersonal = new CallPersonal(transformedData);
                 const result = await callPersonal.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "payment": {
                 const callPayment = new CallPayment(validated.data);
                 const result = await callPayment.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "demand": {
                 const callDemand = new CallDemand(validated.data);
                 const result = validated.submission
                     ? await callDemand.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callDemand.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "order": {
                 const callOrder = new CallOrder(validated.data);
                 const result = validated.submission
                     ? await callOrder.call_with_submission(env, await transformSubmission(validated.submission))
                     : await callOrder.call(env);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
             case "gen_passport": {
                 const result = await gen_passport(env, validated.guard, validated.info);
-                return handleCallResult(result);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
+            }
+            case "proof": {
+                const callProof = new CallProof(validated.data);
+                const result = validated.submission
+                    ? await callProof.call_with_submission(env, await transformSubmission(validated.submission))
+                    : await callProof.call(env);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
+            }
+            case "gen_proof": {
+                const result = await gen_proof(env, validated.proof, validated.server_pubkey, validated.server_signature, validated.proof_type, validated.description, validated.item_count, validated.about_address);
+                return handleCallResult(result, { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined });
             }
         }
         throw new Error(`Unknown on-chain operation type: ${validated.operation_type}`);
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        return {
-            content: [{ type: "text", text: `Error: ${errorMessage}` }],
-            structuredContent: {
-                message: `Error: ${errorMessage}`,
-                result: {
-                    type: "error",
-                    error: errorMessage,
-                },
-            },
-        };
+        return handleCallResult({ error: errorMessage }, validated ? { operation_type: validated.operation_type, data: validated.data, pre_warnings: constraintWarnings.length ? constraintWarnings : undefined } : undefined);
     }
 }
 async function handleAccountOperation(args) {
+    let validated;
     try {
-        const validated = strictParse(AccountOperationSchema, args, "account_operation input");
+        validated = strictParse(AccountOperationSchema, args, "account_operation input");
         const result = await account_operation(validated);
+        const ctx = { operation_type: "account_" + validated.operation_type, data: validated };
         return {
             content: [{ type: "text", text: JSON.stringify(result) }],
             structuredContent: {
@@ -484,26 +670,39 @@ async function handleAccountOperation(args) {
                     status: "success",
                     data: result,
                 },
+                semantic: buildDataSemantic(result, ctx),
             },
         };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
+        const ctx = validated ? { operation_type: "account_" + validated.operation_type, data: validated } : undefined;
+        const classified = classifyError(errorMessage);
+        const errorResult = {
+            status: "error",
+            error: errorMessage,
+        };
+        if (classified.error_code !== undefined)
+            errorResult.error_code = classified.error_code;
+        if (classified.retryable !== undefined)
+            errorResult.retryable = classified.retryable;
+        if (classified.recovery_hint !== undefined)
+            errorResult.recovery_hint = classified.recovery_hint;
         return {
             content: [{ type: "text", text: `Error: ${errorMessage}` }],
             structuredContent: {
-                result: {
-                    status: "error",
-                    error: errorMessage,
-                },
+                result: errorResult,
+                semantic: buildDataSemantic(undefined, ctx, true, errorMessage),
             },
         };
     }
 }
 async function handleMarkOperation(args) {
+    let validated;
     try {
-        const validated = strictParse(LocalMarkOperationSchema, args, "local_mark_operation input");
+        validated = strictParse(LocalMarkOperationSchema, args, "local_mark_operation input");
         const result = await local_mark_operation(validated);
+        const ctx = { operation_type: "mark_" + validated.operation_type, data: validated };
         return {
             content: [{ type: "text", text: JSON.stringify(result) }],
             structuredContent: {
@@ -511,26 +710,36 @@ async function handleMarkOperation(args) {
                     status: "success",
                     data: result,
                 },
+                semantic: buildDataSemantic(result, ctx),
             },
         };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
+        const ctx = validated ? { operation_type: "mark_" + validated.operation_type, data: validated } : undefined;
+        const classified = classifyError(errorMessage);
+        const errorResult = { status: "error", error: errorMessage };
+        if (classified.error_code !== undefined)
+            errorResult.error_code = classified.error_code;
+        if (classified.retryable !== undefined)
+            errorResult.retryable = classified.retryable;
+        if (classified.recovery_hint !== undefined)
+            errorResult.recovery_hint = classified.recovery_hint;
         return {
             content: [{ type: "text", text: `Error: ${errorMessage}` }],
             structuredContent: {
-                result: {
-                    status: "error",
-                    error: errorMessage,
-                },
+                result: errorResult,
+                semantic: buildDataSemantic(undefined, ctx, true, errorMessage),
             },
         };
     }
 }
 async function handleInfoOperation(args) {
+    let validated;
     try {
-        const validated = strictParse(LocalInfoOperationSchema, args, "local_info_operation input");
+        validated = strictParse(LocalInfoOperationSchema, args, "local_info_operation input");
         const result = await local_info_operation(validated);
+        const ctx = { operation_type: "local_info", data: validated };
         return {
             content: [{ type: "text", text: JSON.stringify(result) }],
             structuredContent: {
@@ -538,18 +747,26 @@ async function handleInfoOperation(args) {
                     status: "success",
                     data: result,
                 },
+                semantic: buildDataSemantic(result, ctx),
             },
         };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
+        const ctx = validated ? { operation_type: "local_info", data: validated } : undefined;
+        const classified = classifyError(errorMessage);
+        const errorResult = { status: "error", error: errorMessage };
+        if (classified.error_code !== undefined)
+            errorResult.error_code = classified.error_code;
+        if (classified.retryable !== undefined)
+            errorResult.retryable = classified.retryable;
+        if (classified.recovery_hint !== undefined)
+            errorResult.recovery_hint = classified.recovery_hint;
         return {
             content: [{ type: "text", text: `Error: ${errorMessage}` }],
             structuredContent: {
-                result: {
-                    status: "error",
-                    error: errorMessage,
-                },
+                result: errorResult,
+                semantic: buildDataSemantic(undefined, ctx, true, errorMessage),
             },
         };
     }
@@ -674,7 +891,13 @@ async function handleWatchQueryOperations(args) {
     }
     return {
         content: [{ type: "text", text: JSON.stringify({ result }) }],
-        structuredContent: { result },
+        structuredContent: {
+            result,
+            semantic: buildDataSemantic(result, {
+                operation_type: "query_toolkit",
+                data: validated,
+            }),
+        },
     };
 }
 async function handleWowokInfo(args) {
@@ -700,166 +923,313 @@ async function handleOnchainEvents(args) {
     });
     return {
         content: [{ type: "text", text: JSON.stringify({ result: queryResult }) }],
-        structuredContent: { result: queryResult },
+        structuredContent: {
+            result: queryResult,
+            semantic: buildDataSemantic(queryResult, {
+                operation_type: "onchain_events",
+                data: validated,
+            }),
+        },
     };
 }
-function normalizeAccountOrMark(input) {
-    if (typeof input === 'string') {
-        return { name_or_address: input, local_mark_first: true };
-    }
-    return input;
-}
-function normalizeManyAccountOrMark(input) {
-    if (Array.isArray(input)) {
-        return {
-            entities: input.map(item => typeof item === 'string' ? { name_or_address: item, local_mark_first: true } : item),
-            check_all_founded: true
-        };
-    }
-    return input;
-}
-async function handleMessengerOperation(args) {
-    const validated = strictParse(MessengerOperationInputSchema, args, "messenger_operation input");
+async function handleProjectOperation(args) {
+    const action = args.action;
+    const project = args.project;
+    const object = args.object;
     let result;
-    switch (validated.operation) {
-        case "watch_conversations": {
-            const conversations = await watch_conversations(validated.filter);
-            result = { operation: "watch_conversations", result: conversations };
+    switch (action) {
+        case "list_projects":
+            result = await queryProjects();
             break;
-        }
-        case "send_message": {
-            const sendResult = await send_message(validated.from, normalizeAccountOrMark(validated.to), validated.content, validated.options);
-            const filteredResult = {
-                ...sendResult,
-                merkleData: sendResult.merkleData ? {
-                    leafIndex: sendResult.merkleData.leafIndex,
-                    prevRoot: sendResult.merkleData.prevRoot,
-                    newRoot: sendResult.merkleData.newRoot,
-                    serverSignature: sendResult.merkleData.serverSignature,
-                    serverTimestamp: sendResult.merkleData.serverTimestamp,
-                    serverPublicKey: sendResult.merkleData.serverPublicKey,
-                } : undefined,
-            };
-            result = { operation: "send_message", result: filteredResult };
+        case "list_objects":
+            if (!project)
+                throw new Error("'project' param is required for list_objects");
+            result = await queryProjectObjects(project);
             break;
-        }
-        case "send_file": {
-            const sendResult = await send_file(validated.from, normalizeAccountOrMark(validated.to), validated.filePath, validated.options);
-            const filteredResult = {
-                ...sendResult,
-                merkleData: sendResult.merkleData ? {
-                    leafIndex: sendResult.merkleData.leafIndex,
-                    prevRoot: sendResult.merkleData.prevRoot,
-                    newRoot: sendResult.merkleData.newRoot,
-                    serverSignature: sendResult.merkleData.serverSignature,
-                    serverTimestamp: sendResult.merkleData.serverTimestamp,
-                    serverPublicKey: sendResult.merkleData.serverPublicKey,
-                } : undefined,
-            };
-            result = { operation: "send_file", result: filteredResult };
+        case "shareable":
+            result = await queryShareableObjects();
             break;
-        }
-        case "watch_messages": {
-            const filter = validated.filter ? {
-                ...validated.filter,
-                peerAddress: validated.filter.peerAddress ? normalizeAccountOrMark(validated.filter.peerAddress) : undefined
-            } : undefined;
-            const messages = await watch_messages(filter);
-            result = { operation: "watch_messages", result: messages };
+        case "dependencies":
+            if (!object)
+                throw new Error("'object' param is required for dependencies");
+            result = queryDependencies(object);
             break;
-        }
-        case "extract_zip_messages": {
-            const extractedPaths = await extract_zip_messages(validated.account, validated.messages, validated.outputDir);
-            result = { operation: "extract_zip_messages", result: extractedPaths };
+        case "referenced_by":
+            if (!object)
+                throw new Error("'object' param is required for referenced_by");
+            result = queryReferencedBy(object);
             break;
-        }
-        case "generate_wts": {
-            const params = validated.params ? {
-                ...validated.params,
-                peerAccount: normalizeAccountOrMark(validated.params.peerAccount)
-            } : undefined;
-            const wtsResult = await generate_wts(params);
-            result = { operation: "generate_wts", result: wtsResult };
+        case "pre_publish_check":
+            if (!object)
+                throw new Error("'object' param is required for pre_publish_check");
+            result = { warnings: queryPrePublishCheck(object) };
             break;
-        }
-        case "verify_wts": {
-            const verifyResult = await verify_wts(validated.wtsFilePath);
-            result = { operation: "verify_wts", result: verifyResult };
+        case "cross_project_refs":
+            result = queryCrossProjectReferences();
             break;
-        }
-        case "sign_wts": {
-            const signedPath = await sign_wts(validated.wtsFilePath, validated.account, validated.outputPath);
-            result = { operation: "sign_wts", result: signedPath };
+        case "graph_stats":
+            result = queryGraphStats();
             break;
-        }
-        case "wts2html": {
-            const htmlResult = await wts2html(validated.wtsPath, validated.options);
-            result = { operation: "wts2html", result: htmlResult };
+        case "save_graph":
+            result = { saved: true, path: saveGraph() };
             break;
-        }
-        case "proof_message": {
-            const proofResult = await proof_message(validated.account, validated.messageId, validated.network);
-            result = { operation: "proof_message", result: proofResult };
+        case "load_graph":
+            result = { loaded: loadGraph() };
             break;
-        }
-        case "blacklist": {
-            const blacklistParams = {
-                account: validated.account,
-                op: validated.blacklist.op
-            };
-            if ('users' in validated.blacklist) {
-                blacklistParams.users = normalizeManyAccountOrMark(validated.blacklist.users);
-            }
-            const blacklistResult = await blacklist(blacklistParams);
-            result = { operation: "blacklist", op: validated.blacklist.op, result: blacklistResult.result };
+        default:
+            throw new Error(`Unknown project_operation action: ${action}`);
+    }
+    return {
+        content: [{ type: "text", text: JSON.stringify({ result }) }],
+        structuredContent: { result },
+    };
+}
+async function handleConfigOperation(args) {
+    const action = args.action;
+    let result;
+    switch (action) {
+        case "list":
+            result = { services: listServices() };
             break;
-        }
-        case "friendslist": {
-            const friendslistParams = {
-                account: validated.account,
-                op: validated.friendslist.op
-            };
-            if ('users' in validated.friendslist) {
-                friendslistParams.users = normalizeManyAccountOrMark(validated.friendslist.users);
+        case "toggle": {
+            const service = args.service;
+            if (!service)
+                throw new Error("'service' param is required for toggle");
+            const validServices = ["confirm_gate", "project_service", "harness", "graph_persist", "semantic_rich"];
+            if (!validServices.includes(service)) {
+                throw new Error(`Unknown service: ${service}. Valid: ${validServices.join(", ")}`);
             }
-            const friendslistResult = await friendslist(friendslistParams);
-            result = { operation: "friendslist", op: validated.friendslist.op, result: friendslistResult.result };
+            const newState = toggleService(service);
+            const info = getServiceInfo(service);
+            result = { service, enabled: newState, reminder: info?.reminder };
             break;
         }
-        case "guardlist": {
-            const guardlistResult = await guardlist({
-                account: validated.account,
-                ...validated.guardlist
-            });
-            result = { operation: "guardlist", op: validated.guardlist.op, result: guardlistResult.result };
+        case "enable": {
+            const service = args.service;
+            if (!service)
+                throw new Error("'service' param is required for enable");
+            setServiceEnabled(service, true);
+            const info = getServiceInfo(service);
+            result = { service, enabled: true, reminder: info?.reminder };
             break;
         }
-        case "settings": {
-            const settingsResult = await settings({
-                account: validated.account,
-                ...validated.settings
-            });
-            result = { operation: "settings", op: validated.settings.op, result: settingsResult.result };
+        case "disable": {
+            const service = args.service;
+            if (!service)
+                throw new Error("'service' param is required for disable");
+            setServiceEnabled(service, false);
+            const info = getServiceInfo(service);
+            result = { service, enabled: false, reminder: info?.reminder };
             break;
         }
-        case "mark_messages_as_viewed": {
-            const markedCount = await mark_messages_as_viewed(validated.messageIds, validated.account);
-            result = { operation: "mark_messages_as_viewed", result: markedCount };
+        case "reset": {
+            const service = args.service;
+            if (!service)
+                throw new Error("'service' param is required for reset");
+            resetService(service);
+            const info = getServiceInfo(service);
+            result = { service, enabled: info?.enabled, reminder: info?.reminder, reset: true };
             break;
         }
-        case "mark_conversation_as_viewed": {
-            const markedCount = await mark_conversation_as_viewed(normalizeAccountOrMark(validated.peerAddress), validated.account);
-            result = { operation: "mark_conversation_as_viewed", result: markedCount };
+        case "info": {
+            const service = args.service;
+            if (!service)
+                throw new Error("'service' param is required for info");
+            result = getServiceInfo(service);
             break;
         }
         default:
-            throw new Error(`Unknown messenger operation: ${validated.operation}`);
+            throw new Error(`Unknown config_operation action: ${action}`);
     }
     return {
-        content: [{ type: "text", text: JSON.stringify(result) }],
+        content: [{ type: "text", text: JSON.stringify({ result }) }],
         structuredContent: { result },
     };
 }
+function normalizeAccountOrMark(input) {
+    if (typeof input === 'string') {
+        return { name_or_address: input, local_mark_first: true };
+    }
+    return input;
+}
+function normalizeManyAccountOrMark(input) {
+    if (Array.isArray(input)) {
+        return {
+            entities: input.map(item => typeof item === 'string' ? { name_or_address: item, local_mark_first: true } : item),
+            check_all_founded: true
+        };
+    }
+    return input;
+}
+async function handleMessengerOperation(args) {
+    let validated;
+    try {
+        validated = strictParse(MessengerOperationInputSchema, args, "messenger_operation input");
+        let result;
+        switch (validated.operation) {
+            case "watch_conversations": {
+                const conversations = await watch_conversations(validated.filter);
+                result = { operation: "watch_conversations", result: conversations };
+                break;
+            }
+            case "send_message": {
+                const sendResult = await send_message(validated.from, normalizeAccountOrMark(validated.to), validated.content, validated.options);
+                const filteredResult = {
+                    ...sendResult,
+                    merkleData: sendResult.merkleData ? {
+                        leafIndex: sendResult.merkleData.leafIndex,
+                        prevRoot: sendResult.merkleData.prevRoot,
+                        newRoot: sendResult.merkleData.newRoot,
+                        serverSignature: sendResult.merkleData.serverSignature,
+                        serverTimestamp: sendResult.merkleData.serverTimestamp,
+                        serverPublicKey: sendResult.merkleData.serverPublicKey,
+                    } : undefined,
+                };
+                result = { operation: "send_message", result: filteredResult };
+                break;
+            }
+            case "send_file": {
+                const sendResult = await send_file(validated.from, normalizeAccountOrMark(validated.to), validated.filePath, validated.options);
+                const filteredResult = {
+                    ...sendResult,
+                    merkleData: sendResult.merkleData ? {
+                        leafIndex: sendResult.merkleData.leafIndex,
+                        prevRoot: sendResult.merkleData.prevRoot,
+                        newRoot: sendResult.merkleData.newRoot,
+                        serverSignature: sendResult.merkleData.serverSignature,
+                        serverTimestamp: sendResult.merkleData.serverTimestamp,
+                        serverPublicKey: sendResult.merkleData.serverPublicKey,
+                    } : undefined,
+                };
+                result = { operation: "send_file", result: filteredResult };
+                break;
+            }
+            case "watch_messages": {
+                const filter = validated.filter ? {
+                    ...validated.filter,
+                    peerAddress: validated.filter.peerAddress ? normalizeAccountOrMark(validated.filter.peerAddress) : undefined
+                } : undefined;
+                const messages = await watch_messages(filter);
+                result = { operation: "watch_messages", result: messages };
+                break;
+            }
+            case "extract_zip_messages": {
+                const extractedPaths = await extract_zip_messages(validated.account, validated.messages, validated.outputDir);
+                result = { operation: "extract_zip_messages", result: extractedPaths };
+                break;
+            }
+            case "generate_wts": {
+                const params = validated.params ? {
+                    ...validated.params,
+                    peerAccount: normalizeAccountOrMark(validated.params.peerAccount)
+                } : undefined;
+                const wtsResult = await generate_wts(params);
+                result = { operation: "generate_wts", result: wtsResult };
+                break;
+            }
+            case "verify_wts": {
+                const verifyResult = await verify_wts(validated.wtsFilePath);
+                result = { operation: "verify_wts", result: verifyResult };
+                break;
+            }
+            case "sign_wts": {
+                const signedPath = await sign_wts(validated.wtsFilePath, validated.account, validated.outputPath);
+                result = { operation: "sign_wts", result: signedPath };
+                break;
+            }
+            case "wts2html": {
+                const htmlResult = await wts2html(validated.wtsPath, validated.options);
+                result = { operation: "wts2html", result: htmlResult };
+                break;
+            }
+            case "proof_message": {
+                const proofResult = await proof_message(validated.account, validated.messageId, validated.network);
+                result = { operation: "proof_message", result: proofResult };
+                break;
+            }
+            case "blacklist": {
+                const blacklistParams = {
+                    account: validated.account,
+                    op: validated.blacklist.op
+                };
+                if ('users' in validated.blacklist) {
+                    blacklistParams.users = normalizeManyAccountOrMark(validated.blacklist.users);
+                }
+                const blacklistResult = await blacklist(blacklistParams);
+                result = { operation: "blacklist", op: validated.blacklist.op, result: blacklistResult.result };
+                break;
+            }
+            case "friendslist": {
+                const friendslistParams = {
+                    account: validated.account,
+                    op: validated.friendslist.op
+                };
+                if ('users' in validated.friendslist) {
+                    friendslistParams.users = normalizeManyAccountOrMark(validated.friendslist.users);
+                }
+                const friendslistResult = await friendslist(friendslistParams);
+                result = { operation: "friendslist", op: validated.friendslist.op, result: friendslistResult.result };
+                break;
+            }
+            case "guardlist": {
+                const guardlistResult = await guardlist({
+                    account: validated.account,
+                    ...validated.guardlist
+                });
+                result = { operation: "guardlist", op: validated.guardlist.op, result: guardlistResult.result };
+                break;
+            }
+            case "settings": {
+                const settingsResult = await settings({
+                    account: validated.account,
+                    ...validated.settings
+                });
+                result = { operation: "settings", op: validated.settings.op, result: settingsResult.result };
+                break;
+            }
+            case "mark_messages_as_viewed": {
+                const markedCount = await mark_messages_as_viewed(validated.messageIds, validated.account);
+                result = { operation: "mark_messages_as_viewed", result: markedCount };
+                break;
+            }
+            case "mark_conversation_as_viewed": {
+                const markedCount = await mark_conversation_as_viewed(normalizeAccountOrMark(validated.peerAddress), validated.account);
+                result = { operation: "mark_conversation_as_viewed", result: markedCount };
+                break;
+            }
+            case "pull_messages": {
+                const messages = await pull_messages(validated.account, validated.limit);
+                result = { operation: "pull_messages", result: messages };
+                break;
+            }
+            default:
+                throw new Error(`Unknown messenger operation: ${validated.operation}`);
+        }
+        return {
+            content: [{ type: "text", text: JSON.stringify(result) }],
+            structuredContent: { result },
+        };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const ctx = validated ? { operation_type: "messenger_" + validated.operation, data: validated } : undefined;
+        const classified = classifyError(errorMessage);
+        const errorResult = { operation: "error", error: errorMessage };
+        if (classified.error_code !== undefined)
+            errorResult.error_code = classified.error_code;
+        if (classified.retryable !== undefined)
+            errorResult.retryable = classified.retryable;
+        if (classified.recovery_hint !== undefined)
+            errorResult.recovery_hint = classified.recovery_hint;
+        return {
+            content: [{ type: "text", text: `Error: ${errorMessage}` }],
+            structuredContent: {
+                result: errorResult,
+                semantic: buildDataSemantic(undefined, ctx, true, errorMessage),
+            },
+        };
+    }
+}
 async function handleGuard2File(args) {
     const validated = strictParse(Guard2File_InputSchema, args, "guard2file input");
     const env = getEnvConfig(validated.env);
@@ -898,6 +1268,24 @@ async function handleMachineNode2File(args) {
     const env = getEnvConfig(validated.env);
     try {
         await machineNode2file(validated.machine, validated.file_path, validated.format || "json", env.network);
+        let node_count = undefined;
+        try {
+            const filePath = resolve(validated.file_path);
+            const fileContent = await import('fs/promises').then(fs => fs.readFile(filePath, 'utf-8'));
+            if ((validated.format || "json") === "json") {
+                const parsed = JSON.parse(fileContent);
+                if (Array.isArray(parsed)) {
+                    node_count = parsed.length;
+                }
+            }
+            else {
+                const nodeMatches = fileContent.match(/^##\s+Node:/gm);
+                node_count = nodeMatches ? nodeMatches.length : 0;
+            }
+        }
+        catch {
+            node_count = undefined;
+        }
         const result = {
             result: {
                 status: "success",
@@ -905,10 +1293,12 @@ async function handleMachineNode2File(args) {
                     file_path: resolve(validated.file_path),
                     format: validated.format || "json",
                     machine_object: validated.machine,
-                    node_count: 0,
                 },
             },
         };
+        if (node_count !== undefined) {
+            result.result.data.node_count = node_count;
+        }
         return {
             content: [{ type: "text", text: JSON.stringify(result) }],
             structuredContent: result,
@@ -938,39 +1328,49 @@ async function main() {
     else {
         console.error("Schema files not available. Run 'npm run generate:schemas' to generate them.");
     }
-    server.registerTool("onchain_operations", {
+    if (isProjectServiceEnabled()) {
+        registerSuccessHook((result, context) => {
+            if (context?.operation_type && context?.data) {
+                projectObserve(context.operation_type, context.data, result);
+            }
+        });
+        console.error("ProjectService enabled — object graph observe active");
+    }
+    const activeServices = listServices().filter((s) => s.enabled).map((s) => s.name);
+    console.error(`Phase 2 active services: ${activeServices.join(", ") || "none"}`);
+    reg("onchain_operations", {
         title: "⛓️ On-chain Operations",
-        description: "On-chain operations for WoWok object: service (marketplace listings), machine (workflow templates), progress (order tracking), repository (on-chain database), arbitration (dispute resolution), contact (IM management), treasury (team funds), reward (incentive pools), allocation (auto-distribution), permission (access control), guard (programmable trust rules), personal (public profile), payment (direct coin transfers), demand (service requests), order (order management), gen_passport (verified credentials).",
+        description: "On-chain operations for WoWok object: service (marketplace listings), machine (workflow templates), progress (order tracking), repository (on-chain database), arbitration (dispute resolution), contact (IM management), treasury (team funds), reward (incentive pools), allocation (auto-distribution), permission (access control), guard (programmable trust rules), personal (public profile), payment (direct coin transfers), demand (service requests), order (order management), gen_passport (verified credentials), proof (on-chain proof objects), gen_proof (generate proof shortcut).",
         inputSchema: OnchainOperationsSchema,
         outputSchema: CallOutputSchema,
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true },
-        _meta: createToolMeta("operation", ["service", "machine", "progress", "repository", "arbitration", "contact", "treasury", "reward", "allocation", "permission", "guard", "personal", "payment", "demand", "order", "gen_passport", "on-chain", "blockchain"]),
+        _meta: createToolMeta("operation", ["service", "machine", "progress", "repository", "arbitration", "contact", "treasury", "reward", "allocation", "permission", "guard", "personal", "payment", "demand", "order", "gen_passport", "proof", "gen_proof", "on-chain", "blockchain"]),
     }, handleOnchainOperations);
-    server.registerTool("account_operation", {
+    reg("account_operation", {
         title: "🔒 LOCAL ONLY: Account - Wallet Management",
         description: "🔒 100% LOCAL, NEVER ON-CHAIN 🔒 Manage WoWok accounts locally on device: generate, suspend, resume, faucet-test, operate assets, sign data, etc.",
         inputSchema: AccountOperationSchema,
         outputSchema: AccountOperationOutputWrappedSchema,
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
         _meta: createToolMeta("operation", ["account", "local", "private", "wallet", "off-chain"]),
-    }, handleAccountOperation);
-    server.registerTool("local_mark_operation", {
+    }, handleAccountOperation, statusErrorShape);
+    reg("local_mark_operation", {
         title: "🔒 LOCAL ONLY: LocalMark - Address Book Management",
         description: "100% LOCAL, NEVER ON-CHAIN 🔒 Manage ID names and tags stored ONLY on your local device for easy identification of user address or object IDs by name.",
         inputSchema: LocalMarkOperationSchema,
         outputSchema: LocalMarkOperationOutputWrappedSchema,
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
         _meta: createToolMeta("operation", ["mark", "local", "private", "address-book", "off-chain"]),
-    }, handleMarkOperation);
-    server.registerTool("local_info_operation", {
+    }, handleMarkOperation, statusErrorShape);
+    reg("local_info_operation", {
         title: "🔒 LOCAL ONLY: LocalInfo - Private Data Management",
         description: "100% LOCAL, NEVER ON-CHAIN 🔒 Manage sensitive personal information stored ONLY on your device: delivery addresses, phone numbers, contacts.",
         inputSchema: LocalInfoOperationSchema,
         outputSchema: LocalInfoOperationOutputWrappedSchema,
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: true, openWorldHint: false },
         _meta: createToolMeta("operation", ["info", "local", "private", "data-management", "off-chain"]),
-    }, handleInfoOperation);
-    server.registerTool("wip_file", {
+    }, handleInfoOperation, statusErrorShape);
+    reg("wip_file", {
         title: "🤝 Witness Immutable Promise File Operations",
         description: "generate (create WIP files from markdown and images), verify (integrity check), sign (add signatures), or wip2html (convert to HTML).",
         inputSchema: WipOperationsSchema,
@@ -980,36 +1380,36 @@ async function main() {
         annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: false, openWorldHint: false },
         _meta: createToolMeta("operation", ["wip", "promise", "file-generation", "verification", "signature", "local"]),
     }, handleWipOperations);
-    server.registerTool("messenger_operation", {
+    reg("messenger_operation", {
         title: "💬 Messenger Operations",
-        description: "WoWok encrypted messenger operations: watch conversations (with unread filtering, preview messages), send message, send file, watch messages (with viewed status filtering), extract zip messages, generate WTS, verify WTS, sign WTS, WTS to HTML, proof message on-chain, manage blacklist, friendslist, guardlist, settings, mark messages as viewed, and mark conversation as viewed.",
+        description: "WoWok encrypted messenger operations: watch conversations (with unread filtering, preview messages), send message, send file, watch messages (with viewed status filtering), extract zip messages, generate WTS, verify WTS, sign WTS, WTS to HTML, proof message on-chain, manage blacklist, friendslist, guardlist, settings, mark messages as viewed, mark conversation as viewed, and pull messages from server.",
         inputSchema: MessengerOperationInputSchema,
         outputSchema: MessengerOperationOutputSchema,
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true },
         _meta: createToolMeta("operation", ["messenger", "message", "file", "wts", "blacklist", "friendslist", "guardlist", "settings", "proof", "communication"]),
-    }, handleMessengerOperation);
-    server.registerTool("guard2file", {
+    }, handleMessengerOperation, operationErrorShape, 30000);
+    reg("guard2file", {
         title: "📄 Guard to File - Export Guard Definition",
         description: "Export a Guard object's definition from the blockchain to a local JSON or Markdown file for editing and creating new Guard objects. Note: To query on-chain object information, use the 'query_toolkit' tool instead.",
         inputSchema: Guard2File_InputSchema,
         outputSchema: Guard2File_OutputWrappedSchema,
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("generate file", ["guard", "export", "file", "json", "markdown", "on-chain"]),
-    }, handleGuard2File);
-    server.registerTool("machineNode2file", {
+    }, handleGuard2File, strictStatusErrorShape);
+    reg("machineNode2file", {
         title: "⚙️ Machine Node to File - Export Machine Node Definition",
         description: "Export a Machine object's node definition from the blockchain to a local JSON or Markdown file for editing and creating new Machine objects. Note: To query on-chain object information, use the 'query_toolkit' tool instead.",
         inputSchema: MachineNode2File_InputSchema,
         outputSchema: MachineNode2File_OutputWrappedSchema,
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("generate file", ["machine", "export", "file", "json", "markdown", "on-chain", "workflow"]),
-    }, handleMachineNode2File);
-    server.registerTool("query_toolkit", {
+    }, handleMachineNode2File, strictStatusErrorShape);
+    reg("query_toolkit", {
         title: "🔍 Data Query Toolkit",
         description: "WOWOK data query toolkit — 9 query types covering local device data and on-chain blockchain data:\n\n"
             + "LOCAL (device-only, never on-chain):\n"
             + "1. local_mark_list — Query your LOCAL address book: maps human-readable names to blockchain addresses with optional tags. Use to resolve names→addresses or find addresses by tag.\n"
-            + "2. account_list — Query your LOCAL accounts: view all accounts stored on this device (addresses, public keys, messenger status, suspension state). Use to discover available accounts before operations.\n"
+            + "2. account_list — Query your LOCAL accounts (addresses, messenger status, suspension state). Use filter.includePubkey=true to also include public keys. Use to discover available accounts before operations.\n"
             + "3. local_info_list — Query your LOCAL private info: sensitive data like delivery addresses, phone numbers, contacts stored ONLY on this device.\n"
             + "4. token_list — Query cached token metadata: symbol, decimals, icon URL, description for tokens previously fetched from chain. Use to look up token precision/decimals before performing token operations. Returns: TokenTypeInfo[] (type, alias, name, symbol, decimals, iconUrl).\n"
             + "5. account_balance — Query an account's coin balance OR paginated coin objects. Use balance=true for total amount, or coin={cursor,limit} to list individual coin objects. Supports multi-token via token_type parameter.\n"
@@ -1021,12 +1421,13 @@ async function main() {
             + "For dynamic table data queries (pagination, table items), use the 'onchain_table_data' tool.",
         inputSchema: WatchQueryOperationsSchema,
         outputSchema: z.object({
-            result: z.any().describe("Query result — type depends on query_type. Local queries return arrays (MarkData[], AccountData[], InfoData[], TokenTypeInfo[]). account_balance returns { address, balance? | coin? }. Onchain queries return typed objects or undefined. onchain_received returns ReceivedBalance | ReceivedNormal[].")
+            result: z.unknown().describe("Query result — type depends on query_type. Local queries return arrays (MarkData[], AccountData[], InfoData[], TokenTypeInfo[]). account_balance returns { address, balance? | coin? }. Onchain queries return typed objects or undefined. onchain_received returns ReceivedBalance | ReceivedNormal[]."),
+            semantic: z.unknown().optional().describe("Business semantic summary for the query operation"),
         }),
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("query", ["watch", "query", "on-chain", "local", "events", "objects", "tokens", "balance", "profile"]),
     }, handleWatchQueryOperations);
-    server.registerTool("onchain_table_data", {
+    reg("onchain_table_data", {
         title: "📊 Watch WoWok On-chain Table Data Query",
         description: "Query dynamic table data of on-chain objects — supports paginated table queries and specific table item lookups. Each table item belongs to a parent object type and has a specific meaning:\n\n"
             + "1. onchain_table — Paginated query of ANY object's dynamic fields table (Parent: any object). Returns all entries with keys, types, and object IDs. Use to explore all sub-items of an object.\n"
@@ -1046,7 +1447,7 @@ async function main() {
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("table query", ["on-chain", "table", "dynamic fields", "pagination", "repository", "permission", "reward", "demand", "treasury", "machine", "progress"]),
     }, handleOnchainTableData);
-    server.registerTool("onchain_events", {
+    reg("onchain_events", {
         title: "📅 Watch WoWok On-chain Events",
         description: "Watch on-chain WoWok events by type. Supports arbitration events, new order events, progress events, demand presentation events, demand feedback events, and new entity registration events. Use pagination cursor for fetching large result sets.",
         inputSchema: OnchainEventsInputSchema,
@@ -1054,7 +1455,7 @@ async function main() {
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("watch wowook events", ["events", "on-chain", "arbitration", "order", "progress", "demand", "entity"]),
     }, handleOnchainEvents);
-    server.registerTool("wowok_buildin_info", {
+    reg("wowok_buildin_info", {
         title: "ℹ️ WoWok Build-in Information",
         description: "Query WoWok protocol information: 'constants', 'built-in permissions', 'guard instructions', 'current network', 'value types', or 'mainnet bridge tokens'. For 'mainnet bridge tokens': returns cross-chain bridge tokens (ETH, WETH, WBTC, USDC, USDT) with each token's symbol, WOW-side type tag (wowTypeTag), EVM address, decimals, and description. The wowTypeTag (format {address}::{module}::{struct}) can be used directly as the `type_parameter` of Service / Treasury / Reward / Allocation objects to set their payment token — e.g. use USDT's wowTypeTag to create a Service that accepts USDT payments.",
         inputSchema: ProtocolInfoQuerySchema,
@@ -1062,7 +1463,7 @@ async function main() {
         annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: true },
         _meta: createToolMeta("WoWok info", ["build-in", "constants", "permissions", "guard", "network", "value-types", "bridge-tokens"]),
     }, handleWowokInfo);
-    server.registerTool("schema_query", {
+    reg("schema_query", {
         title: "📋 Schema Query",
         description: "Look up JSON Schemas for WoWok MCP tools and on-chain operations. " +
             "This is the authoritative reference for exact parameter structures, types, and required fields. " +
@@ -1179,7 +1580,7 @@ async function main() {
             structuredContent: response,
         };
     });
-    server.registerTool("bridge_operation", {
+    reg("bridge_operation", {
         title: "🌉 Bridge - Cross-Chain Operations",
         description: "🌉 Simplified cross-chain bridge between WOW and EVM (Ethereum mainnet). Only WOW mainnet provides cross-chain functionality.\n\n" +
             "Key concepts (transparent to user):\n" +
@@ -1203,6 +1604,71 @@ async function main() {
         annotations: { readOnlyHint: false, destructiveHint: true, idempotentHint: false, openWorldHint: true },
         _meta: createToolMeta("operation", ["bridge", "cross-chain", "evm", "ethereum", "wow", "transfer", "rpc"]),
     }, handleBridgeOperations);
+    reg("project_operation", {
+        title: "🗂️ Project - Namespace & Object Graph",
+        description: "Phase 2 project namespace service — manage and query the local object dependency graph (DAG) " +
+            "built on top of local_mark tags. No on-chain writes; all data comes from local marks tagged " +
+            "`project:<prefix>` (auto-injected by the ProjectService when enabled, default ON).\n\n" +
+            "Actions:\n" +
+            "  • list_projects — List all discovered projects (grouped by `project:<prefix>` tag) with object counts.\n" +
+            "  • list_objects — List objects in a project (requires `project` param).\n" +
+            "  • shareable — List objects tagged `shareable:true` (cross-project reusable: common Permission, 3rd-party Arb).\n" +
+            "  • dependencies — Trace forward dependencies of an object (BFS transitive closure + dangling refs).\n" +
+            "  • referenced_by — Reverse query: who references this object?\n" +
+            "  • pre_publish_check — Pre-publish sanity check for a service (dangling deps + cycles).\n" +
+            "  • cross_project_refs — Find edges that cross project boundaries.\n" +
+            "  • graph_stats — Graph statistics (node/edge counts, cycles, dangling deps).\n" +
+            "  • save_graph — Save the in-memory graph to ~/.wowok/project-graph.json (persist across sessions).\n" +
+            "  • load_graph — Load the graph from file (restore after restart).\n\n" +
+            "NOTE: The graph is in-memory by default. Use save_graph/load_graph for cross-session persistence " +
+            "(or toggle graph_persist via config_operation for auto-save). " +
+            "list_projects/shareable always query local_mark (persistent).",
+        inputSchema: z.object({
+            action: z.enum([
+                "list_projects", "list_objects", "shareable",
+                "dependencies", "referenced_by", "pre_publish_check",
+                "cross_project_refs", "graph_stats",
+                "save_graph", "load_graph",
+            ]).describe("Query/action to perform"),
+            project: z.string().optional().describe("Project prefix (for list_objects)"),
+            object: z.string().optional().describe("Object name or address (for dependencies / referenced_by / pre_publish_check)"),
+        }),
+        outputSchema: z.object({
+            result: z.any().describe("Query result — shape depends on action"),
+        }),
+        annotations: { readOnlyHint: true, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: createToolMeta("project", ["project", "namespace", "graph", "dag", "dependency", "reference", "organization"]),
+    }, handleProjectOperation);
+    reg("config_operation", {
+        title: "⚙️ Config - Runtime Service Toggles",
+        description: "Phase 2 runtime configuration — toggle Phase 2 services on/off at runtime WITHOUT restarting the MCP server. " +
+            "This is the session-level switch mechanism: AI can toggle based on user conversation context, or users can " +
+            "directly control which Phase 2 features are active.\n\n" +
+            "Actions:\n" +
+            "  • list — List all services with current state + reminders.\n" +
+            "  • toggle — Toggle a service on/off (requires `service` param). Returns reminder text.\n" +
+            "  • enable — Enable a service (requires `service` param).\n" +
+            "  • disable — Disable a service (requires `service` param).\n" +
+            "  • reset — Reset a service to its default (requires `service` param).\n" +
+            "  • info — Get detailed info about a service (requires `service` param).\n\n" +
+            "Services:\n" +
+            "  • confirm_gate — Safety Confirmation Gate (default ON)\n" +
+            "  • project_service — Project Namespace + Dependency Graph (default ON)\n" +
+            "  • harness — L4 Verify/Recover Loop (default OFF)\n" +
+            "  • graph_persist — Graph Persistence to File (default OFF)\n" +
+            "  • semantic_rich — Semantic Layer Enrichment Reminder (default ON)\n\n" +
+            "NOTE: Toggles persist for the MCP process lifetime. Set WOWOK_RUNTIME_CONFIG_PERSIST=1 " +
+            "to persist across sessions to ~/.wowok/runtime-config.json.",
+        inputSchema: z.object({
+            action: z.enum(["list", "toggle", "enable", "disable", "reset", "info"]).describe("Config action to perform"),
+            service: z.string().optional().describe("Service name (required for toggle/enable/disable/reset/info)"),
+        }),
+        outputSchema: z.object({
+            result: z.any().describe("Config result — shape depends on action"),
+        }),
+        annotations: { readOnlyHint: false, destructiveHint: false, idempotentHint: true, openWorldHint: false },
+        _meta: createToolMeta("config", ["config", "toggle", "service", "runtime", "switch", "enable", "disable"]),
+    }, handleConfigOperation);
     const transport = new StdioServerTransport();
     await server.connect(transport);
     process.on("SIGINT", async () => {