@amaster.ai/employee-runtime-connector 0.1.1-beta.15 → 0.1.1-beta.17

package/dist/amaster-runtime-daemon.mjs

@@ -1913,12 +1913,12 @@ function syncAmasterProviderSettings(agentDir, executorEnv) {
   const settings = readJsonFile(settingsPath);
   const baseUrl = readString(executorEnv.AMASTER_PROVIDER_BASE_URL);
   const imageGenBaseUrl = imageGenBaseUrlFromProviderBaseUrl(baseUrl);
+  const managedApiKey = managedApiKeyConfigValue(executorEnv, apiKey);
   let changed = false;
   const imageGen = settings["pi-image-gen"];
   if (isRecord(imageGen) && isRecord(imageGen.customProviders) && isRecord(imageGen.customProviders.amaster)) {
     const customProviders = imageGen.customProviders;
     const imageGenAmaster = { ...asRecord(customProviders.amaster) };
-    const managedApiKey = managedApiKeyConfigValue(executorEnv, apiKey);
     if (imageGenAmaster.apiKey !== managedApiKey) {
       imageGenAmaster.apiKey = managedApiKey;
       changed = true;
@@ -1941,6 +1941,32 @@ function syncAmasterProviderSettings(agentDir, executorEnv) {
       }
     };
   }
+  const videoGen = settings["pi-video-gen"];
+  if (isRecord(videoGen) && isRecord(videoGen.customProviders) && isRecord(videoGen.customProviders.newapi)) {
+    const customProviders = videoGen.customProviders;
+    const videoGenNewapi = { ...asRecord(customProviders.newapi) };
+    if (videoGenNewapi.apiKey !== managedApiKey) {
+      videoGenNewapi.apiKey = managedApiKey;
+      changed = true;
+    }
+    if (baseUrl && videoGenNewapi.baseUrl !== baseUrl) {
+      videoGenNewapi.baseUrl = baseUrl;
+      changed = true;
+    }
+    const videoGenHeaders = syncManagedBillingHeaders(videoGenNewapi.headers, executorEnv);
+    if (JSON.stringify(videoGenHeaders) !== JSON.stringify(videoGenNewapi.headers)) {
+      if (videoGenHeaders) videoGenNewapi.headers = videoGenHeaders;
+      else delete videoGenNewapi.headers;
+      changed = true;
+    }
+    settings["pi-video-gen"] = {
+      ...asRecord(videoGen),
+      customProviders: {
+        ...customProviders,
+        newapi: videoGenNewapi
+      }
+    };
+  }
   const webAccess = settings["pi-web-access"];
   if (isRecord(webAccess) && isRecord(webAccess.providers)) {
     const webProviders = webAccess.providers;
@@ -2317,6 +2343,10 @@ export default function amasterEffectiveToolsAttestor(pi) {
 
       const expectedEntries = Array.isArray(manifest.entries) ? manifest.entries : [];
       if (expectedEntries.length === 0) throw new Error("effective tool manifest is empty");
+      const proxyMode = manifest.proxyMode ?? "forbidden";
+      if (proxyMode !== "required" && proxyMode !== "forbidden") {
+        throw new Error("effective tool proxy mode is invalid");
+      }
       const expectedByName = new Map(expectedEntries.map((entry) => [entry.name, entry]));
       if (expectedByName.size !== expectedEntries.length) throw new Error("effective tool manifest has duplicate names");
       for (const entry of expectedEntries) {
@@ -2337,7 +2367,8 @@ export default function amasterEffectiveToolsAttestor(pi) {
       activeToolNames.sort();
       const activeToolNameSet = new Set(activeToolNames);
       const proxyPresent = allTools.some((tool) => tool.name === "mcp");
-      const nonCatalogTools = activeToolNames.filter((name) => !expectedByName.has(name));
+      // Hybrid keeps Pi builtins active, so catalog drift applies only to adapter tools;
+      // direct_typed constrains the complete active surface separately via toolAllowlist.
       const adapterTools = allTools.filter((tool) => sourceIsMcpAdapter(tool.sourceInfo));
       const directTools = adapterTools.filter((tool) => tool.name !== "mcp" && activeToolNameSet.has(tool.name)).map((tool) => ({
         name: tool.name,
@@ -2356,14 +2387,16 @@ export default function amasterEffectiveToolsAttestor(pi) {
           : [];
       });
       const effectiveSetHash = toolSetHash(directTools);
-      if (proxyPresent || nonCatalogTools.length > 0 || missing.length > 0 || unexpected.length > 0 || schemaMismatches.length > 0) {
-        throw new Error("effective tool surface mismatch: proxy=" + proxyPresent + " nonCatalog=" + nonCatalogTools.join(",") + " missing=" + missing.join(",") + " unexpected=" + unexpected.join(",") + " schemas=" + schemaMismatches.map((entry) => entry.name).join(","));
+      const proxyMismatch = proxyMode === "required" ? !proxyPresent : proxyPresent;
+      if (proxyMismatch || missing.length > 0 || unexpected.length > 0 || schemaMismatches.length > 0) {
+        throw new Error("effective tool surface mismatch: proxyMode=" + proxyMode + " proxy=" + proxyPresent + " missing=" + missing.join(",") + " unexpected=" + unexpected.join(",") + " schemas=" + schemaMismatches.map((entry) => entry.name).join(","));
       }
       if (effectiveSetHash !== manifest.effectiveSetHash) throw new Error("effective tool set hash mismatch");
       receipt = {
         schemaVersion: SCHEMA_VERSION,
         status: "attested",
         mode,
+        proxyMode,
         proxyPresent,
         effectiveSetHash,
         effectiveTools: directTools.sort((left, right) => left.name.localeCompare(right.name)),
@@ -2409,6 +2442,7 @@ export default function amasterEffectiveToolsAttestor(pi) {
 
 // src/amaster-runtime-daemon/pi-managed-mcp-profile.mjs
 var MANAGED_PI_MCP_TOOL_MODE = "proxy_only";
+var MANAGED_PI_HYBRID_MCP_TOOL_MODE = "hybrid";
 var MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE = "direct_typed";
 var MANAGED_PI_MCP_ARGS_NORMALIZATION = "json_string_control_characters_v1";
 var MANAGED_PI_MCP_ARGS_NORMALIZER_FILENAME = "amaster-mcp-args-normalizer.js";
@@ -2435,35 +2469,18 @@ function createManagedPiMcpProfileApi(options = {}) {
     "amaster.read_company_diagnosis",
     "amaster.publish_company_diagnosis_brief"
   ]);
+  const HYBRID_DIRECT_TYPED_V1_TOOL_NAMES = /* @__PURE__ */ new Set([
+    "amaster.read_company_snapshot",
+    "runtime_action.describe",
+    "amaster.read_issue_document",
+    "amaster.read_issue_evidence"
+  ]);
   const PROVIDER_SAFE_TOOL_NAME = /^[A-Za-z][A-Za-z0-9_-]*$/;
   const PI_BUILTIN_TOOL_NAMES = /* @__PURE__ */ new Set(["read", "bash", "edit", "write", "grep", "find", "ls", "mcp"]);
   const MINIMUM_PI_VERSION = [0, 73, 1];
   const MINIMUM_MCP_ADAPTER_VERSION = [2, 6, 1];
   const MANAGED_BROWSER_USE_PACKAGE = "@amaster.ai/pi-browser-use";
   const MANAGED_BROWSER_USE_PLUGIN = "browser-use";
-  const MANAGED_WEB_ACCESS_PACKAGE = "@amaster.ai/pi-web-access";
-  const MANAGED_TELEMETRY_PACKAGE = "@amaster.ai/pi-telemetry";
-  const MANAGED_TELEMETRY_ENV_NAMES = [
-    "PI_TELEMETRY_TASK_RUN_ID",
-    "PI_TELEMETRY_SERVICE_NAME",
-    "PI_TELEMETRY_SERVICE_VERSION",
-    "PI_TELEMETRY_INCLUDE_PAYLOADS",
-    "PI_TELEMETRY_LANGFUSE_ENABLED",
-    "PI_TELEMETRY_LANGFUSE_PUBLIC_KEY",
-    "PI_TELEMETRY_LANGFUSE_SECRET_KEY",
-    "PI_TELEMETRY_LANGFUSE_BASE_URL",
-    "PI_TELEMETRY_LANGFUSE_FLUSH_AT",
-    "PI_TELEMETRY_LANGFUSE_FLUSH_INTERVAL_MS",
-    "PI_TELEMETRY_OTEL_ENABLED",
-    "PI_TELEMETRY_OTEL_ENDPOINT",
-    "PI_TELEMETRY_OTEL_HEADERS",
-    "PI_TELEMETRY_OTEL_FLUSH_AT",
-    "PI_TELEMETRY_OTEL_FLUSH_INTERVAL_MS"
-  ];
-  const MANAGED_TELEMETRY_PROTECTED_ENV_NAMES = [
-    "PI_TELEMETRY_LANGFUSE_SECRET_KEY",
-    "PI_TELEMETRY_OTEL_HEADERS"
-  ];
   const MANAGED_BROWSER_USE_BOOLEAN_SETTINGS = [
     "headless",
     "categoryNetwork",
@@ -2490,6 +2507,12 @@ function createManagedPiMcpProfileApi(options = {}) {
     "AMASTER-CLI_CODING_AGENT_SESSION_DIR",
     "PI_AGENT_MCP_SERVERS_FILE"
   ]);
+  const RUN_OWNED_SETTINGS_ENV = /* @__PURE__ */ new Set([
+    ...FORBIDDEN_COMMAND_ENV2,
+    "MCP_DIRECT_TOOLS",
+    "PAPERCLIP_API_KEY",
+    "AMASTER_BOARD_API_KEY"
+  ]);
   const ALLOWED_COMMAND_ENV2 = new Set(MANAGED_PI_PROVIDER_ENV_NAMES);
   const SAFE_INHERITED_ENV2 = /* @__PURE__ */ new Set([
     "PATH",
@@ -2515,8 +2538,7 @@ function createManagedPiMcpProfileApi(options = {}) {
     "PAPERCLIP_TASK_ID",
     "PAPERCLIP_AGENT_ID",
     "PAPERCLIP_COMPANY_ID",
-    "AMASTER_EMPLOYEE_COMPANY_ID",
-    ...MANAGED_TELEMETRY_ENV_NAMES
+    "AMASTER_EMPLOYEE_COMPANY_ID"
   ]);
   const FORBIDDEN_ARGV = /* @__PURE__ */ new Set([
     "--no-tools",
@@ -2685,20 +2707,21 @@ function createManagedPiMcpProfileApi(options = {}) {
       excludeTools: definition.excludeTools
     }));
   }
-  function validateDirectCatalog(gateway) {
+  function validateDirectCatalog(gateway, mcpToolMode) {
     const catalog = record8(gateway.toolCatalog);
     if (catalog.schemaVersion !== DIRECT_CATALOG_SCHEMA_VERSION) {
       throw new Error("pi_managed_mcp_invalid: direct tool catalog schema mismatch");
     }
     const tools = Array.isArray(catalog.tools) ? catalog.tools.map(record8) : [];
-    if (tools.length !== DIRECT_TYPED_V1_TOOL_NAMES.size) {
+    const admittedToolNames = mcpToolMode === MANAGED_PI_HYBRID_MCP_TOOL_MODE ? HYBRID_DIRECT_TYPED_V1_TOOL_NAMES : DIRECT_TYPED_V1_TOOL_NAMES;
+    if (tools.length !== admittedToolNames.size) {
       throw new Error("pi_managed_mcp_invalid: direct tool catalog size mismatch");
     }
     const names = /* @__PURE__ */ new Set();
     const exposedNames = /* @__PURE__ */ new Set();
     const normalized = tools.map((tool) => {
       const name = nonEmpty2(tool.name, "toolCatalog.tools.name");
-      if (!DIRECT_TYPED_V1_TOOL_NAMES.has(name) || names.has(name)) {
+      if (!admittedToolNames.has(name) || names.has(name)) {
         throw new Error("pi_managed_mcp_invalid: direct tool catalog name mismatch");
       }
       names.add(name);
@@ -2722,6 +2745,9 @@ function createManagedPiMcpProfileApi(options = {}) {
       if (!(/* @__PURE__ */ new Set(["read", "write", "destructive"])).has(riskLevel)) {
         throw new Error(`pi_managed_mcp_invalid: direct tool risk level mismatch for ${name}`);
       }
+      if (mcpToolMode === MANAGED_PI_HYBRID_MCP_TOOL_MODE && riskLevel !== "read") {
+        throw new Error(`pi_managed_mcp_invalid: hybrid direct tool must be read-only for ${name}`);
+      }
       return {
         name,
         exposedName,
@@ -2729,6 +2755,7 @@ function createManagedPiMcpProfileApi(options = {}) {
         inputSchema,
         schemaHash,
         riskLevel,
+        // Match the adapter-exposed schema, which omits top-level $schema and additionalProperties.
         effectiveSchemaHash: stablePiToolSchemaHash(inputSchema, { adapterNormalized: true })
       };
     });
@@ -2818,10 +2845,10 @@ function createManagedPiMcpProfileApi(options = {}) {
     }
     if ((runtimeAuth.issueId ?? null) !== (headers["x-amaster-issue-id"] ?? null)) throw new Error("pi_managed_mcp_invalid: issue authority mismatch");
     const mcpToolMode = gateway.mcpToolMode ?? MANAGED_PI_MCP_TOOL_MODE;
-    if (mcpToolMode !== MANAGED_PI_MCP_TOOL_MODE && mcpToolMode !== MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE) {
+    if (mcpToolMode !== MANAGED_PI_MCP_TOOL_MODE && mcpToolMode !== MANAGED_PI_HYBRID_MCP_TOOL_MODE && mcpToolMode !== MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE) {
       throw new Error("pi_managed_mcp_invalid: unsupported managed Pi MCP tool mode");
     }
-    const directCatalog = mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE ? validateDirectCatalog(gateway) : null;
+    const directCatalog = mcpToolMode !== MANAGED_PI_MCP_TOOL_MODE ? validateDirectCatalog(gateway, mcpToolMode) : null;
     if (mcpToolMode === MANAGED_PI_MCP_TOOL_MODE && gateway.toolCatalog !== void 0) {
       throw new Error("pi_managed_mcp_invalid: proxy-only authority cannot carry a direct tool catalog");
     }
@@ -2832,13 +2859,38 @@ function createManagedPiMcpProfileApi(options = {}) {
     return /^(?:(?:access|refresh|id)_)?token$/.test(normalized) || normalized.includes("api_key") || normalized.includes("secret") || normalized.includes("password") || normalized.includes("credential") || normalized.includes("authorization") || normalized.includes("cookie");
   }
   function collectAuthSecretStrings2(value, output = []) {
-    if (!value || typeof value !== "object" || Array.isArray(value)) return output;
+    if (!value || typeof value !== "object") return output;
+    if (Array.isArray(value)) {
+      for (const entry of value) collectAuthSecretStrings2(entry, output);
+      return output;
+    }
     for (const [key, entry] of Object.entries(value)) {
       if (typeof entry === "string" && entry && isSensitiveAuthKey2(key)) output.push(entry);
-      else if (entry && typeof entry === "object" && !Array.isArray(entry)) collectAuthSecretStrings2(entry, output);
+      else if (entry && typeof entry === "object") collectAuthSecretStrings2(entry, output);
     }
     return output;
   }
+  function referencedSettingsEnvironment(settings, baseEnv) {
+    const names = /* @__PURE__ */ new Set();
+    const visit = (value) => {
+      if (typeof value === "string") {
+        for (const match of value.matchAll(/\$(?:\{([A-Za-z_][A-Za-z0-9_]*)(?::-[^}]*)?\}|([A-Za-z_][A-Za-z0-9_]*))/g)) {
+          names.add(match[1] ?? match[2]);
+        }
+      } else if (Array.isArray(value)) {
+        for (const entry of value) visit(entry);
+      } else if (value && typeof value === "object") {
+        for (const entry of Object.values(value)) visit(entry);
+      }
+    };
+    visit(settings);
+    const env = {};
+    for (const name of names) {
+      if (RUN_OWNED_SETTINGS_ENV.has(name)) continue;
+      if (typeof baseEnv?.[name] === "string" && baseEnv[name]) env[name] = baseEnv[name];
+    }
+    return env;
+  }
   function assertInvocationIsolation2(input) {
     for (const name of Object.keys(record8(input.commandEnv))) {
       if (FORBIDDEN_COMMAND_ENV2.has(name)) throw new Error(`pi_managed_mcp_env_override_blocked: ${name}`);
@@ -2948,49 +3000,7 @@ function createManagedPiMcpProfileApi(options = {}) {
       }
     };
   }
-  function selectManagedWebAccess(sourceSettings, npmSource) {
-    const packageSpec = Array.isArray(sourceSettings.packages) ? sourceSettings.packages.find((entry) => npmPackageName(entry) === MANAGED_WEB_ACCESS_PACKAGE) : null;
-    if (typeof packageSpec !== "string") return null;
-    const packagePath = join4(npmSource, "node_modules", ...MANAGED_WEB_ACCESS_PACKAGE.split("/"), "package.json");
-    if (!existsSync3(packagePath) || lstatSync2(packagePath).isSymbolicLink() || !lstatSync2(packagePath).isFile()) {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_WEB_ACCESS_PACKAGE} package is unavailable`);
-    }
-    let packageMetadata;
-    try {
-      packageMetadata = JSON.parse(readFileSync3(packagePath, "utf8"));
-    } catch {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_WEB_ACCESS_PACKAGE} package metadata is invalid`);
-    }
-    if (!packageMetadata || packageMetadata.name !== MANAGED_WEB_ACCESS_PACKAGE) {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_WEB_ACCESS_PACKAGE} package identity mismatch`);
-    }
-    return {
-      packageSpec,
-      config: record8(sourceSettings["pi-web-access"])
-    };
-  }
-  function selectManagedTelemetry(sourceSettings, npmSource) {
-    const packageSpec = Array.isArray(sourceSettings.packages) ? sourceSettings.packages.find((entry) => npmPackageName(entry) === MANAGED_TELEMETRY_PACKAGE) : null;
-    if (typeof packageSpec !== "string") return null;
-    const packagePath = join4(npmSource, "node_modules", ...MANAGED_TELEMETRY_PACKAGE.split("/"), "package.json");
-    if (!existsSync3(packagePath) || lstatSync2(packagePath).isSymbolicLink() || !lstatSync2(packagePath).isFile()) {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_TELEMETRY_PACKAGE} package is unavailable`);
-    }
-    let packageMetadata;
-    try {
-      packageMetadata = JSON.parse(readFileSync3(packagePath, "utf8"));
-    } catch {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_TELEMETRY_PACKAGE} package metadata is invalid`);
-    }
-    if (packageMetadata.name !== MANAGED_TELEMETRY_PACKAGE) {
-      throw new Error(`pi_managed_mcp_attestation_failed: configured ${MANAGED_TELEMETRY_PACKAGE} package identity mismatch`);
-    }
-    return {
-      packageSpec,
-      config: record8(sourceSettings["pi-telemetry"])
-    };
-  }
-  function seedPiRuntime(sourceHome, agentDir, sourceAcquisition = null, mcpToolMode = MANAGED_PI_MCP_TOOL_MODE) {
+  function seedPiRuntime(sourceHome, agentDir, sourceAcquisition = null, mcpToolMode = MANAGED_PI_MCP_TOOL_MODE, baseEnv = {}) {
     const source = resolve2(nonEmpty2(sourceHome, "sourcePiHome"));
     const sourceStat = lstatSync2(source);
     if (!sourceStat.isDirectory() || sourceStat.isSymbolicLink()) {
@@ -3018,40 +3028,31 @@ function createManagedPiMcpProfileApi(options = {}) {
         throw new Error("pi_managed_mcp_attestation_failed: source Pi settings are invalid");
       }
     }
-    const browserUse = selectManagedBrowserUse(sourceSettings, npmSource);
-    const webAccess = sourceAcquisition ? null : selectManagedWebAccess(sourceSettings, npmSource);
-    const telemetry = selectManagedTelemetry(sourceSettings, npmSource);
+    const browserUse = sourceAcquisition ? selectManagedBrowserUse(sourceSettings, npmSource) : null;
     if (sourceAcquisition && !browserUse) {
       throw new Error("pi_managed_mcp_source_acquisition_packages_missing");
     }
-    const settings = {
+    const sourcePackages = Array.isArray(sourceSettings.packages) ? [...sourceSettings.packages] : [];
+    const settings = sourceAcquisition ? {
       ...typeof sourceSettings.defaultProvider === "string" ? { defaultProvider: sourceSettings.defaultProvider } : {},
       ...typeof sourceSettings.defaultModel === "string" ? { defaultModel: sourceSettings.defaultModel } : {},
-      packages: [
-        "npm:pi-mcp-adapter",
-        ...telemetry ? [telemetry.packageSpec] : [],
-        ...webAccess ? [webAccess.packageSpec] : [],
-        ...!sourceAcquisition && browserUse ? [browserUse.packageSpec] : []
-      ],
-      ...telemetry ? { "pi-telemetry": telemetry.config } : {},
-      ...webAccess ? { "pi-web-access": webAccess.config } : {},
-      ...!sourceAcquisition && browserUse ? {
-        plugins: {
-          [MANAGED_BROWSER_USE_PLUGIN]: browserUse.plugin
-        },
-        "pi-browser-use": browserUse.config
-      } : {}
+      packages: ["npm:pi-mcp-adapter"]
+    } : {
+      ...sourceSettings,
+      packages: sourcePackages.some((entry) => npmPackageName(entry) === "pi-mcp-adapter") ? sourcePackages : ["npm:pi-mcp-adapter", ...sourcePackages]
     };
+    const settingsEnv = sourceAcquisition ? {} : referencedSettingsEnvironment(settings, baseEnv);
     writePrivateFile2(join4(agentDir, "settings.json"), `${JSON.stringify(settings, null, 2)}
 `);
     const extensionsDir = join4(agentDir, "extensions");
     mkdirSync3(extensionsDir, { recursive: true, mode: 448 });
-    if (mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE) {
+    if (mcpToolMode !== MANAGED_PI_MCP_TOOL_MODE) {
       writePrivateFile2(
         join4(extensionsDir, MANAGED_PI_EFFECTIVE_TOOLS_ATTESTOR_FILENAME),
         managedPiEffectiveToolsAttestorExtensionSource()
       );
-    } else {
+    }
+    if (mcpToolMode !== MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE) {
       writePrivateFile2(
         join4(extensionsDir, MANAGED_PI_MCP_ARGS_NORMALIZER_FILENAME),
         managedPiMcpArgsNormalizerExtensionSource()
@@ -3066,7 +3067,10 @@ function createManagedPiMcpProfileApi(options = {}) {
     copyPrivateFile(join4(source, "models.json"), join4(agentDir, "models.json"));
     copyPrivateFile(join4(source, "SYSTEM.md"), join4(agentDir, "SYSTEM.md"));
     const authSource = join4(source, "auth.json");
-    const protectedValues = [];
+    const protectedValues = collectAuthSecretStrings2(settings);
+    for (const [name, value] of Object.entries(settingsEnv)) {
+      if (isSensitiveAuthKey2(name)) protectedValues.push(value);
+    }
     if (copyPrivateFile(authSource, join4(agentDir, "auth.json"))) {
       try {
         collectAuthSecretStrings2(JSON.parse(readFileSync3(authSource, "utf8")), protectedValues);
@@ -3077,7 +3081,7 @@ function createManagedPiMcpProfileApi(options = {}) {
     const npmStat = lstatSync2(npmSource);
     if (!npmStat.isDirectory() || npmStat.isSymbolicLink()) throw new Error("pi_managed_mcp_source_config_unsafe: Pi npm root");
     symlinkSync(npmSource, join4(agentDir, "npm"), "dir");
-    return { adapterVersion, protectedValues };
+    return { adapterVersion, protectedValues, settingsEnv };
   }
   function seedDelegatedPiRuntime(sourceHome, agentDir) {
     const source = resolve2(nonEmpty2(sourceHome, "sourcePiHome"));
@@ -3215,7 +3219,8 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
     } catch {
       throw new Error("pi_managed_mcp_effective_tools_failed: probe receipt missing");
     }
-    if (receipt.status !== "attested" || receipt.mode !== "probe" || receipt.proxyPresent !== false || receipt.effectiveSetHash !== input.effectiveSetHash || receipt.attestorSourceSha256 !== input.attestorSourceSha256 || receipt.configSha256 !== input.configSha256 || receipt.cacheSha256 !== input.cacheSha256) {
+    const expectedProxyPresent = input.proxyMode === "required";
+    if (receipt.status !== "attested" || receipt.mode !== "probe" || receipt.proxyMode !== input.proxyMode || receipt.proxyPresent !== expectedProxyPresent || receipt.effectiveSetHash !== input.effectiveSetHash || receipt.attestorSourceSha256 !== input.attestorSourceSha256 || receipt.configSha256 !== input.configSha256 || receipt.cacheSha256 !== input.cacheSha256) {
       throw new Error("pi_managed_mcp_effective_tools_failed: probe receipt mismatch");
     }
     if (sha256(readFileSync3(input.configPath)) !== input.configSha256) {
@@ -3225,6 +3230,8 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
       throw new Error("pi_managed_mcp_effective_tools_failed: cache drifted during probe");
     }
     return {
+      effectiveToolProxyMode: receipt.proxyMode,
+      effectiveToolProxyPresent: receipt.proxyPresent,
       effectiveToolSetHash: receipt.effectiveSetHash,
       effectiveToolProbeDigest: sha256(stablePiJson(receipt)),
       effectiveToolProbeAt: receipt.attestedAt,
@@ -3260,7 +3267,13 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
         commandId: input.commandId
       });
       const sourcePiHome = nonEmpty2(input.baseEnv?.PI_CODING_AGENT_DIR ?? input.baseEnv?.PI_AGENT_HOME, "sourcePiHome");
-      const seededRuntime = seedPiRuntime(sourcePiHome, piCodingAgentDir, input.sourceAcquisition, mcpToolMode);
+      const seededRuntime = seedPiRuntime(
+        sourcePiHome,
+        piCodingAgentDir,
+        input.sourceAcquisition,
+        mcpToolMode,
+        input.baseEnv
+      );
       const restoredNativeSession = restoreManagedPiSessionRollout(input, sessionsRoot, runDir, executorHome, authority);
       const configPath = join4(piCodingAgentDir, "mcp.json");
       const directToolNames = directCatalog?.tools.map((tool) => tool.exposedName) ?? [];
@@ -3274,7 +3287,7 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
       const config = {
         settings: {
           toolPrefix: "none",
-          ...directCatalog ? { disableProxyTool: true } : {}
+          ...mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE ? { disableProxyTool: true } : {}
         },
         mcpServers: {
           [SUPPORTED_SERVER_NAME2]: serverConfig
@@ -3319,6 +3332,7 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
             name: tool.exposedName,
             schemaHash: tool.effectiveSchemaHash
           }))),
+          proxyMode: mcpToolMode === MANAGED_PI_HYBRID_MCP_TOOL_MODE ? "required" : "forbidden",
           attestorSourceSha256,
           configSha256: sha256(readFileSync3(configPath)),
           cacheSha256
@@ -3333,10 +3347,12 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
           configPath,
           configSha256: sha256(readFileSync3(configPath)),
           attestorSourceSha256,
-          effectiveSetHash: manifest.effectiveSetHash
+          effectiveSetHash: manifest.effectiveSetHash,
+          proxyMode: manifest.proxyMode
         };
       }
       const env = {
+        ...seededRuntime.settingsEnv,
         ...buildIsolatedEnvironment2(input.baseEnv, input.commandEnv),
         HOME: home,
         PI_AGENT_HOME: piAgentHome,
@@ -3365,7 +3381,7 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
         ...executorAttestation,
         mcpAdapterVersion: seededRuntime.adapterVersion,
         mcpToolMode,
-        mcpArgsNormalization: directCatalog ? "none" : MANAGED_PI_MCP_ARGS_NORMALIZATION,
+        mcpArgsNormalization: mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE ? "none" : MANAGED_PI_MCP_ARGS_NORMALIZATION,
         ...directCatalog ? {
           catalogSetHash: directCatalog.setHash,
           ...effectiveToolsAttestation
@@ -3387,11 +3403,10 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
         configPath,
         markerPath,
         env,
-        toolAllowlist: directCatalog ? [...directToolNames] : null,
+        toolAllowlist: mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE ? [...directToolNames] : null,
         protectedValues: [.../* @__PURE__ */ new Set([
           sessionToken,
           ...seededRuntime.protectedValues,
-          ...MANAGED_TELEMETRY_PROTECTED_ENV_NAMES.map((name) => input.baseEnv?.[name]).filter((value) => typeof value === "string" && value.length > 0),
           ...MANAGED_PI_PROVIDER_PROTECTED_ENV_NAMES.map((name) => input.commandEnv?.[name]).filter((value) => typeof value === "string" && value.length > 0)
         ])],
         attestation: {
@@ -3408,6 +3423,9 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
   function prepareDelegatedPiMcpProfile2(input) {
     assertInvocationIsolation2(input);
     const { gateway, gatewayUrl, sessionToken, headers, runId, mcpToolMode, directCatalog } = validateAuthority2(input);
+    if (mcpToolMode === MANAGED_PI_HYBRID_MCP_TOOL_MODE) {
+      throw new Error("pi_delegated_mcp_hybrid_unsupported: managed effective-tool attestation is required");
+    }
     const runDir = resolve2(nonEmpty2(input.runDir, "runDir"));
     const cwd = resolve2(nonEmpty2(input.cwd, "cwd"));
     if (!within4(cwd, runDir)) throw new Error("pi_delegated_mcp_owner_mismatch: cwd is outside the managed run");
@@ -3453,7 +3471,7 @@ ${result3.stderr ?? ""}`, "Pi", MINIMUM_PI_VERSION);
         ...sourceMcp,
         settings: {
           ...record8(sourceMcp.settings),
-          ...directCatalog ? { disableProxyTool: true } : {}
+          ...mcpToolMode === MANAGED_PI_DIRECT_TYPED_MCP_TOOL_MODE ? { disableProxyTool: true } : {}
         },
         mcpServers: {
           ...record8(sourceMcp.mcpServers),
@@ -4043,6 +4061,39 @@ function retainedSourceExecutorEntry(entry, executorKind) {
   };
 }
 
+// src/amaster-runtime-daemon/task-context-policy.mjs
+var TASK_CONTEXT_MANIFEST_VERSION = "task-context-v1";
+function resolveTaskContextMemoryPolicy(context) {
+  const contextRecord = asRecord(context);
+  const hasManifest = Object.prototype.hasOwnProperty.call(contextRecord, "taskContextManifest");
+  const manifest = asRecord(contextRecord.taskContextManifest);
+  const version = readString(manifest.version);
+  if (!hasManifest) {
+    return {
+      governed: false,
+      memoryScope: null,
+      allowAutomaticHistoricalContext: true,
+      allowCompanyMemoryMount: true
+    };
+  }
+  if (!version) throw new Error("task_context_manifest_version_required");
+  if (version !== TASK_CONTEXT_MANIFEST_VERSION) {
+    throw new Error(`task_context_manifest_version_unsupported:${version}`);
+  }
+  const memoryScope = readString(manifest.memoryScope);
+  if (memoryScope !== "none" && memoryScope !== "task") {
+    throw new Error("task_context_manifest_memory_scope_invalid");
+  }
+  return {
+    governed: true,
+    memoryScope,
+    // The current runtime has Company memory, not a task-scoped memory store.
+    // Governed scopes therefore never authorize Company history implicitly.
+    allowAutomaticHistoricalContext: false,
+    allowCompanyMemoryMount: false
+  };
+}
+
 // src/amaster-runtime-daemon/prompt-compiler.mjs
 var DEADLINE_POSTURE_GUARD = "If a named time window or milestone is missed, skip that window and keep the task moving: never lower quality, bypass approvals, fabricate results, or stop the whole task because of the miss. Record a deadline-posture receipt with targetMilestoneRef, posture, onMiss=skip_this_window_and_continue, taskContinuation, and the next owner/action; the receipt is an execution signal, not Server-side proof.";
 var MIN_PROMPT_BUDGET_CHARS = 8192;
@@ -4295,14 +4346,15 @@ function resolvedDependencySections(context, input, contextScope, snapshotFreshn
     "Compare each returned latestRevisionId with the expected value. On revision mismatch, do not perform downstream writes; report it.",
     ...tuples.flatMap((tuple, index) => {
       const readArguments = { issueId: tuple.blockerSelector, key: tuple.key };
-      const call = input.executorKind === "pi" && input.managedMcpToolMode === "proxy_only" ? {
+      const directToolName = managedDirectToolName(input, "amaster.read_issue_document");
+      const call = directToolName ? readArguments : input.executorKind === "pi" && managedPiMcpProxyAvailable(input) ? {
         server: "amaster",
         tool: "amaster.read_issue_document",
         args: JSON.stringify(readArguments)
       } : readArguments;
       return [
         `- Required read ${index + 1}: issue ${JSON.stringify(tuple.blockerSelector)}${tuple.blockerId ? ` (id ${JSON.stringify(tuple.blockerId)})` : ""}; document ${JSON.stringify(tuple.documentId)}; key ${JSON.stringify(tuple.key)}; expected latestRevisionId ${JSON.stringify(tuple.expectedLatestRevisionId)}${tuple.expectedLatestRevisionNumber != null ? `; revisionNumber ${tuple.expectedLatestRevisionNumber}` : ""}.`,
-        input.executorKind === "pi" && input.managedMcpToolMode === "proxy_only" ? `  Exact Pi \`mcp\` arguments: ${JSON.stringify(call)}` : `  Call amaster.read_issue_document with these exact arguments: ${JSON.stringify(call)}`
+        directToolName ? `  Call \`${directToolName}\` with these exact object arguments: ${JSON.stringify(call)}` : input.executorKind === "pi" && managedPiMcpProxyAvailable(input) ? `  Exact Pi \`mcp\` arguments: ${JSON.stringify(call)}` : `  Call amaster.read_issue_document with these exact arguments: ${JSON.stringify(call)}`
       ];
     })
   ].join("\n") : "";
@@ -4372,6 +4424,7 @@ function wikiAccessRuleLine(input) {
   return "";
 }
 function optionalTaskWikiContextSection(context) {
+  if (!resolveTaskContextMemoryPolicy(context).allowAutomaticHistoricalContext) return null;
   const snapshot = asRecord(context.mirrorxTaskWikiContext);
   if (readString(snapshot.schemaVersion) !== "mirrorx.task-wiki-context.v1") return null;
   const querySeeds = (Array.isArray(snapshot.querySeeds) ? snapshot.querySeeds : []).map(readString).filter(Boolean).slice(0, 3);
@@ -4426,6 +4479,31 @@ function optionalTaskWikiContextSection(context) {
     truncationReason: ready ? null : `wiki_optional_context_gap:${readString(snapshot.gapCode) ?? "invalid_snapshot"}`
   };
 }
+function taskContextAuthoritySection(context) {
+  const manifest = asRecord(context.taskContextManifest);
+  if (readString(manifest.version) !== "task-context-v1") return null;
+  const sourceRefs = (Array.isArray(manifest.sourceRefs) ? manifest.sourceRefs : []).map(asRecord).map((ref) => ({
+    kind: readString(ref.kind),
+    id: readString(ref.id),
+    revision: readString(ref.revision),
+    scope: readString(ref.scope),
+    useReason: readString(ref.useReason)
+  })).filter((ref) => ref.kind && ref.id && ref.revision && ref.scope);
+  if (sourceRefs.length === 0) return null;
+  return {
+    content: [
+      "Immutable Task admission context authority. It identifies admitted sources and automatic memory policy; it does not replace the runtime Context Manifest below.",
+      jsonText({
+        version: manifest.version,
+        memoryScope: readString(manifest.memoryScope),
+        freshness: readString(manifest.freshness),
+        sourceRefs
+      })
+    ].join("\n"),
+    sourceRef: sourceRefs.map((ref) => `${ref.kind}:${ref.id}@${ref.revision}`),
+    scope: sourceRefs.map((ref) => ref.scope)
+  };
+}
 function fixedRules(input, includeIssueLine) {
   const issue = asRecord(asRecord(input.context).paperclipIssue);
   const businessOutcome = asRecord(asRecord(issue.taskRequirements).businessOutcome);
@@ -4452,7 +4530,7 @@ function fixedRules(input, includeIssueLine) {
     wikiAccessRuleLine(input),
     "- Runtime Artifact lineage fields sourceWorkProductId and sourceWorkProductIds accept only current artifact work product ids returned as result.effectResult.workProductId by a succeeded upload_artifact action. Never pass a documentId or revisionId as artifact lineage.",
     "- When all inputs are issue documents and there is no source artifact work product, persist the derived result with upsert_document and do not call upload_artifact for a derived or review artifact.",
-    input.hasGovernedMcp && input.executorKind === "pi" && input.managedMcpToolMode === "proxy_only" ? "- For proxy-only Pi MCP writes, put the complete target argument object directly in actual `mcp` string `args` as strict JSON; escape quotes, backslashes, and control characters. Do not stage or print tool calls. If inner JSON syntax fails, correct it once without changing values; never repeat a possibly accepted call. After `runtime_action.describe`, emit the write." : ""
+    input.hasGovernedMcp && input.executorKind === "pi" && input.managedMcpToolMode === "proxy_only" ? "- For proxy-only Pi MCP writes, put the complete target argument object directly in actual `mcp` string `args` as strict JSON; escape quotes, backslashes, and control characters. Do not stage or print tool calls. If inner JSON syntax fails, correct it once without changing values; never repeat a possibly accepted call. After `runtime_action.describe`, emit the write." : input.hasGovernedMcp && input.executorKind === "pi" && input.managedMcpToolMode === "hybrid" ? "- For hybrid Pi MCP writes, call direct `runtime_action_describe`, then put long-tail write arguments in `mcp.args` as strict JSON. Never stage, print, or repeat a possibly accepted call." : ""
   ].filter(Boolean).join("\n");
 }
 function approvalContinuationText(input) {
@@ -4542,12 +4620,15 @@ function continuationRuntimeActionEnvelope(context) {
   return envelope;
 }
 function managedDirectToolName(input, canonicalName) {
-  if (input.managedMcpToolMode !== "direct_typed") return null;
+  if (input.managedMcpToolMode !== "direct_typed" && input.managedMcpToolMode !== "hybrid") return null;
   const catalog = asRecord(input.managedMcpToolCatalog);
   const tools = Array.isArray(catalog.tools) ? catalog.tools.map(asRecord) : [];
   const match = tools.find((tool) => readString(tool.name) === canonicalName);
   return readString(match?.exposedName) ?? null;
 }
+function managedPiMcpProxyAvailable(input) {
+  return input.managedMcpToolMode === "proxy_only" || input.managedMcpToolMode === "hybrid";
+}
 function runtimeActionContinuationOptionText(input) {
   if (!isRecoveryWakeReason(input.wakeReason)) return "";
   const heading = "### Runtime Action Continuation Option";
@@ -4566,12 +4647,8 @@ Runtime Action continuation is unavailable: managed governed MCP capability is m
 Runtime Action continuation is unavailable: continuationRuntimeActionEnvelope is missing or invalid. Do not guess a tool call.`;
   }
   if (input.executorKind === "pi") {
-    if (input.managedMcpToolMode === "direct_typed") {
-      const toolName = managedDirectToolName(input, "runtime_action.submit");
-      if (!toolName) {
-        return `${heading}
-Runtime Action continuation is unavailable: the run catalog does not advertise the required typed submit tool. Do not guess a tool call.`;
-      }
+    const toolName = managedDirectToolName(input, "runtime_action.submit");
+    if (toolName) {
       return [
         heading,
         `Only after selecting continuation/todo from the disposition menu, emit an actual \`${toolName}\` typed tool call with the exact object arguments below. Do not print this JSON as prose.`,
@@ -4580,7 +4657,11 @@ Runtime Action continuation is unavailable: the run catalog does not advertise t
         "```"
       ].join("\n");
     }
-    if (input.managedMcpToolMode !== "proxy_only") {
+    if (!managedPiMcpProxyAvailable(input)) {
+      if (input.managedMcpToolMode === "direct_typed") {
+        return `${heading}
+Runtime Action continuation is unavailable: the run catalog does not advertise the required typed submit tool. Do not guess a tool call.`;
+      }
       return `${heading}
 Runtime Action continuation is unavailable: managed Pi MCP tool mode is not proxy_only. Do not guess a proxy or direct-tool call.`;
     }
@@ -4692,7 +4773,7 @@ function runtimeDecompositionRequirementText(context) {
 }
 function deliveryReadCallText(input) {
   const args = { issueId: input.issueId };
-  if (input.executorKind === "pi" && input.managedMcpToolMode === "proxy_only") {
+  if (input.executorKind === "pi" && managedPiMcpProxyAvailable(input)) {
     return `emit an mcp proxy call: ${JSON.stringify({
       server: "amaster",
       tool: "amaster.read_issue_delivery",
@@ -4763,7 +4844,11 @@ function runtimeDeliveryReadinessText(context, input) {
 }
 function readIssueEvidenceCommentCallText(issueId, commentId, options) {
   const readArguments = { refs: [{ kind: "issue_comment", issueId, commentId }] };
-  if (options?.executorKind === "pi" && options?.managedMcpToolMode === "proxy_only") {
+  const directToolName = managedDirectToolName(options ?? {}, "amaster.read_issue_evidence");
+  if (directToolName) {
+    return `call \`${directToolName}\` with these exact object arguments: ${JSON.stringify(readArguments)}`;
+  }
+  if (options?.executorKind === "pi" && managedPiMcpProxyAvailable(options)) {
     return `emit an mcp proxy call: ${JSON.stringify({ server: "amaster", tool: "amaster.read_issue_evidence", args: JSON.stringify(readArguments) })}`;
   }
   return `call amaster.read_issue_evidence with these exact arguments: ${JSON.stringify(readArguments)}`;
@@ -4781,36 +4866,37 @@ function taskCommentRefGuidance(input) {
   return `References like comment:<id> above mark truncated comment bodies. Fetch the full text before relying on them \u2014 ${call} (replace <id> with the referenced comment id).`;
 }
 function piMcpProxyExamplesText(input) {
-  if (!input.hasGovernedMcp || input.executorKind !== "pi" || input.managedMcpToolMode !== "proxy_only" || isRecoveryWakeReason(input.wakeReason)) return "";
+  if (!input.hasGovernedMcp || input.executorKind !== "pi" || !managedPiMcpProxyAvailable(input) || isRecoveryWakeReason(input.wakeReason)) return "";
+  const hybrid = input.managedMcpToolMode === "hybrid";
   const proxy = (tool, args) => JSON.stringify({
     server: "amaster",
     tool,
     args: JSON.stringify(args)
   });
   return [
-    "The Pi native tool is the outer `mcp` proxy. Emit these as actual tool calls; `args` is the stringified inner canonical object. Pi validates this string schema before extension hooks, so never send object-valued `args`:",
+    hybrid ? "For governed tools not exposed in the direct typed list, use the outer `mcp` proxy. Before the first long-tail proxy call, describe that exact canonical tool; `args` is the stringified inner canonical object and must never be object-valued." : "The Pi native tool is the outer `mcp` proxy. Emit these as actual tool calls; `args` is the stringified inner canonical object. Pi validates this string schema before extension hooks, so never send object-valued `args`:",
     "Keep review payload strings short. Reference the exact document key and revision in `target`; do not duplicate the reviewed document body in `prompt` or `detailsMarkdown`.",
     "payload.supersedesInteractionId is invalid. provenance.supersedesInteractionId is only for replacing a currently pending governed interaction; after changes_requested or rejected resolution, do not send a supersession id.",
     "update_parent.comment creates a separate persistent issue comment. Omit it when add_comment already recorded the message.",
-    `- describe: ${proxy("runtime_action.describe", { schemaVersion: "runtime-action-v1", actionType: "update_parent" })}`,
+    ...!hybrid ? [`- describe: ${proxy("runtime_action.describe", { schemaVersion: "runtime-action-v1", actionType: "update_parent" })}`] : [],
     `- submit: ${proxy("runtime_action.submit", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-progress", action: { type: "update_parent", status: "in_progress" } })}`,
     `- submit intermediate document review interaction: ${proxy("runtime_action.submit", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-review", action: { type: "create_interaction", kind: "request_confirmation", continuationPolicy: "wake_assignee_on_accept", provenance: { purposeCode: "review_document_revision", requirementRefs: ["acceptance:document_review"], attentionOwner: { kind: "board", id: "board" }, epochKey: "document_revision:22222222-2222-4222-8222-222222222222" }, payload: { version: 1, resolutionMode: "review", prompt: "Review `plan` revision 1.", target: { type: "issue_document", issueId: "11111111-1111-4111-8111-111111111111", documentId: "33333333-3333-4333-8333-333333333333", key: "plan", revisionId: "22222222-2222-4222-8222-222222222222", revisionNumber: 1 } } } })}`,
     `- plan: ${proxy("runtime_action.plan", { schemaVersion: "runtime-action-v1", idempotencyKey: "task-123-plan", actions: [{ type: "update_parent", status: "in_progress" }] })}`,
     `- commit the returned plan revision: ${proxy("runtime_action.commit", { schemaVersion: "runtime-action-v1", planId: "11111111-1111-4111-8111-111111111111", revision: "plan-revision-1" })}`,
-    `- read document: ${proxy("amaster.read_issue_document", { issueId: "AM-123", key: "plan" })}`
+    ...!hybrid ? [`- read document: ${proxy("amaster.read_issue_document", { issueId: "AM-123", key: "plan" })}`] : []
   ].join("\n");
 }
 function piDirectTypedToolsText(input) {
-  if (!input.hasGovernedMcp || input.executorKind !== "pi" || input.managedMcpToolMode !== "direct_typed") return "";
+  if (!input.hasGovernedMcp || input.executorKind !== "pi" || input.managedMcpToolMode !== "direct_typed" && input.managedMcpToolMode !== "hybrid") return "";
   const catalog = asRecord(input.managedMcpToolCatalog);
   const tools = (Array.isArray(catalog.tools) ? catalog.tools : []).map(asRecord).map((tool) => ({ name: readString(tool.exposedName), description: readString(tool.description) })).filter((tool) => tool.name);
   if (tools.length === 0) {
     return "Direct typed governed tools are unavailable because the run catalog snapshot is empty. Do not guess a proxy or tool name.";
   }
   return [
-    "This run uses the attested direct typed Governed MCP surface below. Call these exact names with object arguments; do not call the `mcp` proxy and do not stringify an inner argument envelope.",
+    input.managedMcpToolMode === "hybrid" ? "This run exposes the attested high-frequency Governed MCP tools below as direct typed tools. Call these exact names with object arguments and do not send them through the `mcp` proxy." : "This run uses the attested direct typed Governed MCP surface below. Call these exact names with object arguments; do not call the `mcp` proxy and do not stringify an inner argument envelope.",
     ...tools.map((tool) => `- ${tool.name}${tool.description ? `: ${tool.description}` : ""}`),
-    "A tool not listed above is unavailable in this run. Do not infer a namespace or fall back to REST/bare MCP."
+    input.managedMcpToolMode === "hybrid" ? "For a canonical tool not listed above, use the single managed `mcp` proxy only after exact describe. Never infer an alias, use REST, or bypass the governed Gateway." : "A tool not listed above is unavailable in this run. Do not infer a namespace or fall back to REST/bare MCP."
   ].join("\n");
 }
 function sectionText(section) {
@@ -4919,9 +5005,14 @@ function compileCommandPromptWithManifest(input, options = {}) {
     resolvedDependencies.details.content ? `Auxiliary predecessor context (may be truncated):
 ${resolvedDependencies.details.content}` : ""
   ].filter(Boolean).join("\n\n") : "";
-  const piMcpProxyExamples = resolvedDependencies.required.content ? "" : [piMcpProxyExamplesText(input), piDirectTypedToolsText(input)].filter(Boolean).join("\n");
+  const piDirectTypedTools = piDirectTypedToolsText(input);
+  const piMcpProxyExamples = [
+    resolvedDependencies.required.content ? "" : piMcpProxyExamplesText(input),
+    piDirectTypedTools
+  ].filter(Boolean).join("\n");
   const deliveryReadinessContent = runtimeDeliveryReadinessText(context, input);
   const optionalTaskWikiContext = optionalTaskWikiContextSection(context);
+  const taskContextAuthority = taskContextAuthoritySection(context);
   const rawSections = [
     { name: "recovery_instruction", title: "Recovery Instruction", priority: 100, sourceRef: `run:${input.runId ?? "unknown"}`, content: completeRecoveryInstruction, truncationReason: completeRecoveryInstruction ? null : "mode_selection" },
     { name: "approval_continuation", title: "Approved Runtime Action Continuation", priority: 99, sourceRef: `run:${input.runId ?? "unknown"}`, content: approvalContinuationText(input), truncationReason: mode === "continuation" ? null : "mode_selection" },
@@ -4940,8 +5031,15 @@ ${resolvedDependencies.details.content}` : ""
     { name: "runtime_rules", title: "", priority: 100, sourceRef: `command:${input.commandId}`, content: fixedRules(input, !hasTask) },
     { name: "runtime_authorization", title: "Runtime Action Contract", priority: 98, sourceRef: `run:${input.runId ?? "unknown"}`, content: runtimeAuthorizationText(context, mode, { suppressOrdinaryCompletionContract }) },
     { name: "runtime_decomposition_requirement", title: "Required Task Decomposition", priority: 98, sourceRef: `issue:${input.issueId ?? "unknown"}`, content: runtimeDecompositionRequirementText(context) },
+    ...taskContextAuthority ? [{ name: "task_context_authority", title: "Task Context Authority", priority: 98, ...taskContextAuthority }] : [],
     ...verifiedCompanyContext.content ? [{ name: "verified_company_context", title: "Verified Company Context", priority: 96, sourceRef: verifiedCompanyContext.sourceRef, observedAt: verifiedCompanyContext.observedAt, freshness: { kind: "run_snapshot" }, content: verifiedCompanyContext.content }] : [],
-    ...piMcpProxyExamples ? [{ name: "pi_mcp_proxy_examples", title: "Pi MCP Proxy Examples", priority: 96, sourceRef: "amaster_governed_mcp_proxy_contract", content: piMcpProxyExamples }] : [],
+    ...piMcpProxyExamples ? [{
+      name: "pi_mcp_proxy_examples",
+      title: piDirectTypedTools ? "Pi Governed MCP Tools" : "Pi MCP Proxy Examples",
+      priority: 96,
+      sourceRef: "amaster_governed_mcp_proxy_contract",
+      content: piMcpProxyExamples
+    }] : [],
     { name: "governed_reads", title: "Governed External Reads", priority: 88, sourceRef: governedReads.provenance.map((entry) => entry.sourceRef), observedAt: governedReads.provenance.map((entry) => entry.observedAt), freshness: governedReads.provenance.map((entry) => entry.freshness), scope: governedReads.provenance.map((entry) => entry.scope), content: governedReads.content },
     ...optionalTaskWikiContext ? [optionalTaskWikiContext] : [],
     { name: "agent_instructions", title: "Agent Instructions", priority: 100, sourceRef: "agent_instructions_bundle", content: readString(input.agentInstructions) ?? "" },
@@ -9546,7 +9644,7 @@ function assertSourceAcquisitionRuntimeAuthority({
 }
 
 // src/amaster-runtime-daemon.mjs
-var CONNECTOR_VERSION = "0.1.1-beta.15";
+var CONNECTOR_VERSION = "0.1.1-beta.17";
 var CONNECTOR_CONTRACT_VERSION = "2026-06-04.v1";
 var SOURCE_ACQUISITION_CAPABILITY = "source_acquisition_v1";
 var SOURCE_ACQUISITION_PROFILE_VERSION = "source_acquisition_v1";
@@ -14027,6 +14125,9 @@ async function executeRunCommand(config, command) {
     throw new Error(`runtime_actions_v2_preflight_failed: ${executor.kind} command lacks an exact managed governed MCP profile`);
   }
   const workspace = resolveExecutionWorkspace(config, command, { executorKind: executor.kind });
+  const taskContextMemoryPolicy = resolveTaskContextMemoryPolicy(
+    asRecord(asRecord(command.payload).contextSnapshot)
+  );
   const cwd = workspace.cwd;
   try {
     await materializeAgentInstructionsBundle(config, command, workspace);
@@ -14238,20 +14339,26 @@ async function executeRunCommand(config, command) {
     }
     if (piChildAllocator2) {
       try {
-        const companyId = readString(commandRuntimeAuth(command).companyId) ?? readString(asRecord(command.payload).companyId);
-        if (!companyId) throw new Error("pi_company_memory_company_id_required");
-        const companyMemoryGroup = resolveCompanyPiMemoryGroup({
-          root: companyPiHomeRoot(process.env),
-          companyId
-        });
-        const assignment = piChildAllocator2.acquire(commandRunId(command), {
-          gid: companyMemoryGroup.gid
-        });
+        const companyMemoryGroup = taskContextMemoryPolicy.allowCompanyMemoryMount ? (() => {
+          const companyId = readString(commandRuntimeAuth(command).companyId) ?? readString(asRecord(command.payload).companyId);
+          if (!companyId) throw new Error("pi_company_memory_company_id_required");
+          return {
+            companyId,
+            ...resolveCompanyPiMemoryGroup({
+              root: companyPiHomeRoot(process.env),
+              companyId
+            })
+          };
+        })() : null;
+        const assignment = piChildAllocator2.acquire(
+          commandRunId(command),
+          companyMemoryGroup ? { gid: companyMemoryGroup.gid } : {}
+        );
         piChildAssignmentAcquired = true;
-        if (managedMcpProfile) {
+        if (managedMcpProfile && companyMemoryGroup) {
           piCompanyMemory = prepareCompanyPiMemory({
             root: companyMemoryGroup.root,
-            companyId,
+            companyId: companyMemoryGroup.companyId,
             gid: companyMemoryGroup.gid,
             profileRoot: managedMcpProfile.profileRoot,
             profileHome: managedMcpProfile.env.PI_AGENT_HOME,

package/dist/amaster-runtime.mjs

@@ -6,7 +6,7 @@ import { basename, dirname, join, resolve } from "node:path";
 import { homedir, hostname } from "node:os";
 import { fileURLToPath } from "node:url";
 
-const CONNECTOR_VERSION = "0.1.1-beta.15";
+const CONNECTOR_VERSION = "0.1.1-beta.17";
 
 const CAPABILITIES = [
   "remote_registration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/employee-runtime-connector",
-  "version": "0.1.1-beta.15",
+  "version": "0.1.1-beta.17",
   "description": "MirrorX runtime connector CLI and daemon",
   "license": "MIT",
   "type": "module",