@leo000001/codex-mcp 2.0.2 → 2.1.0

package/dist/index.js

@@ -191,6 +191,7 @@ var COMMAND_DECISIONS = [
   "accept",
   "acceptForSession",
   "acceptWithExecpolicyAmendment",
+  "applyNetworkPolicyAmendment",
   "decline",
   "cancel"
 ];
@@ -199,6 +200,7 @@ var ALL_DECISIONS = [
   "accept",
   "acceptForSession",
   "acceptWithExecpolicyAmendment",
+  "applyNetworkPolicyAmendment",
   "decline",
   "cancel"
 ];
@@ -233,7 +235,7 @@ var DEFAULT_TERMINAL_CLEANUP_MS = 5 * 60 * 1e3;
 var CLEANUP_INTERVAL_MS = 6e4;
 
 // src/app-server/client.ts
-var CLIENT_VERSION = true ? "2.0.2" : "0.0.0-dev";
+var CLIENT_VERSION = true ? "2.1.0" : "0.0.0-dev";
 var DEFAULT_REQUEST_TIMEOUT = 3e4;
 var STARTUP_REQUEST_TIMEOUT = 9e4;
 var MAX_WRITE_QUEUE_BYTES = 5 * 1024 * 1024;
@@ -1119,6 +1121,10 @@ var SessionManager = class {
             approvalId: req.approvalId,
             commandActions: req.commandActions,
             proposedExecpolicyAmendment: req.proposedExecpolicyAmendment,
+            availableDecisions: req.availableDecisions,
+            proposedNetworkPolicyAmendments: req.proposedNetworkPolicyAmendments,
+            additionalPermissions: req.additionalPermissions,
+            networkApprovalContext: req.networkApprovalContext,
             createdAt: req.createdAt
           });
         }
@@ -1220,6 +1226,17 @@ var SessionManager = class {
       );
     }
     if (req.kind === "command") {
+      const available = parseAvailableDecisionSet(req.availableDecisions);
+      if (available && !available.has(decision)) {
+        throw new Error(
+          `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: Decision '${decision}' is not available for this approval prompt`
+        );
+      }
+      if (!available && decision === "applyNetworkPolicyAmendment") {
+        throw new Error(
+          `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: Decision '${decision}' is not supported by this Codex CLI version (missing availableDecisions)`
+        );
+      }
       if (!COMMAND_DECISIONS.includes(decision)) {
         throw new Error(
           `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: Invalid command decision '${decision}'`
@@ -1230,6 +1247,33 @@ var SessionManager = class {
           `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: execpolicy_amendment required for acceptWithExecpolicyAmendment`
         );
       }
+      if (decision !== "acceptWithExecpolicyAmendment" && extra?.execpolicy_amendment !== void 0) {
+        throw new Error(
+          `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: execpolicy_amendment is only valid for acceptWithExecpolicyAmendment`
+        );
+      }
+      if (decision === "applyNetworkPolicyAmendment") {
+        const amendment = extra?.network_policy_amendment;
+        if (!amendment) {
+          throw new Error(
+            `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment required for applyNetworkPolicyAmendment`
+          );
+        }
+        if (amendment.action !== "allow" && amendment.action !== "deny") {
+          throw new Error(
+            `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment.action must be 'allow' or 'deny'`
+          );
+        }
+        if (!amendment.host) {
+          throw new Error(
+            `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment.host required for applyNetworkPolicyAmendment`
+          );
+        }
+      } else if (extra?.network_policy_amendment !== void 0) {
+        throw new Error(
+          `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment is only valid for applyNetworkPolicyAmendment`
+        );
+      }
     } else if (req.kind === "fileChange") {
       if (!FILE_CHANGE_DECISIONS.includes(decision)) {
         throw new Error(
@@ -1243,7 +1287,10 @@ var SessionManager = class {
     }
     let response;
     if (req.kind === "command") {
-      response = buildCommandApprovalResponse(decision, extra?.execpolicy_amendment);
+      response = buildCommandApprovalResponse(decision, {
+        execpolicy_amendment: extra?.execpolicy_amendment,
+        network_policy_amendment: extra?.network_policy_amendment
+      });
     } else if (req.kind === "fileChange") {
       response = { decision };
     }
@@ -1501,6 +1548,12 @@ var SessionManager = class {
           const proposedExecpolicyAmendment = normalizeStringArrayOrNull(
             approvalParams.proposedExecpolicyAmendment
           );
+          const availableDecisions = Array.isArray(approvalParams.availableDecisions) ? approvalParams.availableDecisions : null;
+          const proposedNetworkPolicyAmendments = Array.isArray(
+            approvalParams.proposedNetworkPolicyAmendments
+          ) ? approvalParams.proposedNetworkPolicyAmendments : null;
+          const additionalPermissions = "additionalPermissions" in approvalParams ? approvalParams.additionalPermissions : void 0;
+          const networkApprovalContext = "networkApprovalContext" in approvalParams ? approvalParams.networkApprovalContext : void 0;
           const pending = {
             requestId,
             kind: "command",
@@ -1512,6 +1565,10 @@ var SessionManager = class {
             approvalId,
             commandActions,
             proposedExecpolicyAmendment,
+            availableDecisions,
+            proposedNetworkPolicyAmendments,
+            additionalPermissions,
+            networkApprovalContext,
             createdAt: (/* @__PURE__ */ new Date()).toISOString(),
             resolved: false,
             respond: (result) => client.respondToServer(id, result)
@@ -1559,7 +1616,11 @@ var SessionManager = class {
               cwd: approvalParams.cwd,
               reason,
               commandActions,
-              proposedExecpolicyAmendment
+              proposedExecpolicyAmendment,
+              availableDecisions,
+              proposedNetworkPolicyAmendments,
+              additionalPermissions,
+              networkApprovalContext
             },
             true
           );
@@ -1878,7 +1939,11 @@ function compactActionsForBudget(actions) {
     itemId: action.itemId,
     createdAt: action.createdAt,
     commandActions: action.commandActions,
-    proposedExecpolicyAmendment: action.proposedExecpolicyAmendment
+    proposedExecpolicyAmendment: action.proposedExecpolicyAmendment,
+    availableDecisions: action.availableDecisions,
+    additionalPermissions: action.additionalPermissions,
+    networkApprovalContext: action.networkApprovalContext,
+    proposedNetworkPolicyAmendments: action.proposedNetworkPolicyAmendments
   }));
 }
 function compactActionParamsForBudget(action) {
@@ -1911,7 +1976,11 @@ function compactActionsToMinimum(actions) {
       itemId: first.itemId,
       createdAt: first.createdAt,
       commandActions: first.commandActions,
-      proposedExecpolicyAmendment: first.proposedExecpolicyAmendment
+      proposedExecpolicyAmendment: first.proposedExecpolicyAmendment,
+      availableDecisions: first.availableDecisions,
+      additionalPermissions: first.additionalPermissions,
+      networkApprovalContext: first.networkApprovalContext,
+      proposedNetworkPolicyAmendments: first.proposedNetworkPolicyAmendments
     }
   ];
 }
@@ -2135,8 +2204,9 @@ function toSensitiveInfo(session) {
     config: session.config
   };
 }
-function buildCommandApprovalResponse(decision, execpolicy_amendment) {
+function buildCommandApprovalResponse(decision, extra) {
   if (decision === "acceptWithExecpolicyAmendment") {
+    const execpolicy_amendment = extra?.execpolicy_amendment;
     if (!execpolicy_amendment || execpolicy_amendment.length === 0) {
       throw new Error(
         `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: execpolicy_amendment required for acceptWithExecpolicyAmendment`
@@ -2150,11 +2220,41 @@ function buildCommandApprovalResponse(decision, execpolicy_amendment) {
       }
     };
   }
+  if (decision === "applyNetworkPolicyAmendment") {
+    const amendment = extra?.network_policy_amendment;
+    if (!amendment) {
+      throw new Error(
+        `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment required for applyNetworkPolicyAmendment`
+      );
+    }
+    return {
+      decision: {
+        applyNetworkPolicyAmendment: {
+          network_policy_amendment: amendment
+        }
+      }
+    };
+  }
   return { decision };
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
+function parseAvailableDecisionSet(available) {
+  if (!Array.isArray(available) || available.length === 0) return null;
+  const set = /* @__PURE__ */ new Set();
+  for (const entry of available) {
+    if (typeof entry === "string") {
+      set.add(entry);
+      continue;
+    }
+    if (isRecord(entry)) {
+      if ("acceptWithExecpolicyAmendment" in entry) set.add("acceptWithExecpolicyAmendment");
+      if ("applyNetworkPolicyAmendment" in entry) set.add("applyNetworkPolicyAmendment");
+    }
+  }
+  return set.size > 0 ? set : null;
+}
 function extractThreadId(result) {
   if (!isRecord(result)) {
     throw new Error(`Error [${"INTERNAL" /* INTERNAL */}]: Invalid thread response: expected object`);
@@ -2272,9 +2372,9 @@ function executeCodexCheck(args, sessionManager) {
   const pollOptions = args.pollOptions;
   switch (args.action) {
     case "poll": {
-      if (args.requestId !== void 0 || args.decision !== void 0 || args.execpolicy_amendment !== void 0 || args.denyMessage !== void 0 || args.answers !== void 0) {
+      if (args.requestId !== void 0 || args.decision !== void 0 || args.execpolicy_amendment !== void 0 || args.network_policy_amendment !== void 0 || args.denyMessage !== void 0 || args.answers !== void 0) {
         return {
-          error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: requestId/decision/execpolicy_amendment/denyMessage/answers are only valid for respond_* actions`,
+          error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: requestId/decision/execpolicy_amendment/network_policy_amendment/denyMessage/answers are only valid for respond_* actions`,
           isError: true
         };
       }
@@ -2310,6 +2410,31 @@ function executeCodexCheck(args, sessionManager) {
           isError: true
         };
       }
+      if (args.decision === "applyNetworkPolicyAmendment") {
+        if (!args.network_policy_amendment) {
+          return {
+            error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment required for applyNetworkPolicyAmendment`,
+            isError: true
+          };
+        }
+        if (args.network_policy_amendment.action !== "allow" && args.network_policy_amendment.action !== "deny") {
+          return {
+            error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment.action must be 'allow' or 'deny'`,
+            isError: true
+          };
+        }
+        if (!args.network_policy_amendment.host) {
+          return {
+            error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment.host required for applyNetworkPolicyAmendment`,
+            isError: true
+          };
+        }
+      } else if (args.network_policy_amendment !== void 0) {
+        return {
+          error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: network_policy_amendment is only valid with decision='applyNetworkPolicyAmendment'`,
+          isError: true
+        };
+      }
       if (!ALL_DECISIONS.includes(args.decision)) {
         return {
           error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: Unknown decision '${args.decision}'`,
@@ -2319,6 +2444,7 @@ function executeCodexCheck(args, sessionManager) {
       try {
         sessionManager.resolveApproval(args.sessionId, args.requestId, args.decision, {
           execpolicy_amendment: args.execpolicy_amendment,
+          network_policy_amendment: args.network_policy_amendment,
           denyMessage: args.denyMessage
         });
       } catch (err) {
@@ -2338,9 +2464,9 @@ function executeCodexCheck(args, sessionManager) {
           isError: true
         };
       }
-      if (args.decision !== void 0 || args.execpolicy_amendment !== void 0 || args.denyMessage !== void 0) {
+      if (args.decision !== void 0 || args.execpolicy_amendment !== void 0 || args.network_policy_amendment !== void 0 || args.denyMessage !== void 0) {
         return {
-          error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: decision/execpolicy_amendment/denyMessage are only valid for respond_permission`,
+          error: `Error [${"INVALID_ARGUMENT" /* INVALID_ARGUMENT */}]: decision/execpolicy_amendment/network_policy_amendment/denyMessage are only valid for respond_permission`,
           isError: true
         };
       }
@@ -2935,7 +3061,7 @@ function registerResources(server, deps) {
 }
 
 // src/server.ts
-var SERVER_VERSION = true ? "2.0.2" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.1.0" : "0.0.0-dev";
 function formatErrorMessage(err) {
   const message = err instanceof Error ? err.message : String(err);
   const m = /^Error \[([A-Z_]+)\]:\s*(.*)$/.exec(message);
@@ -3004,9 +3130,13 @@ function createServer(serverCwd) {
     // respond_permission
     requestId: z.string().optional().describe("Request ID from actions[]"),
     decision: z.enum(ALL_DECISIONS).optional().describe(
-      "Approval decision for respond_permission. acceptWithExecpolicyAmendment requires execpolicy_amendment."
+      "Approval decision for respond_permission. acceptWithExecpolicyAmendment requires execpolicy_amendment; applyNetworkPolicyAmendment requires network_policy_amendment."
     ),
     execpolicy_amendment: z.array(z.string()).optional().describe("For acceptWithExecpolicyAmendment only"),
+    network_policy_amendment: z.object({
+      action: z.enum(["allow", "deny"]),
+      host: z.string().min(1)
+    }).optional().describe("For applyNetworkPolicyAmendment only"),
     denyMessage: z.string().optional().describe("Deny reason (not sent to agent)"),
     // respond_user_input
     answers: z.record(
@@ -3043,6 +3173,12 @@ function createServer(serverCwd) {
             "execpolicy_amendment is only allowed for action='respond_permission'."
           );
         }
+        if (value.network_policy_amendment !== void 0) {
+          addIssue(
+            "network_policy_amendment",
+            "network_policy_amendment is only allowed for action='respond_permission'."
+          );
+        }
         if (value.denyMessage !== void 0) {
           addIssue("denyMessage", "denyMessage is only allowed for action='respond_permission'.");
         }
@@ -3062,6 +3198,7 @@ function createServer(serverCwd) {
           addIssue("answers", "answers is only allowed for action='respond_user_input'.");
         }
         const needsExecpolicy = value.decision === "acceptWithExecpolicyAmendment";
+        const needsNetworkPolicy = value.decision === "applyNetworkPolicyAmendment";
         if (needsExecpolicy && (!value.execpolicy_amendment || value.execpolicy_amendment.length === 0)) {
           addIssue(
             "execpolicy_amendment",
@@ -3074,6 +3211,18 @@ function createServer(serverCwd) {
             "execpolicy_amendment is only allowed when decision='acceptWithExecpolicyAmendment'."
           );
         }
+        if (needsNetworkPolicy && !value.network_policy_amendment) {
+          addIssue(
+            "network_policy_amendment",
+            "network_policy_amendment is required when decision='applyNetworkPolicyAmendment'."
+          );
+        }
+        if (!needsNetworkPolicy && value.network_policy_amendment !== void 0) {
+          addIssue(
+            "network_policy_amendment",
+            "network_policy_amendment is only allowed when decision='applyNetworkPolicyAmendment'."
+          );
+        }
         break;
       }
       case "respond_user_input": {
@@ -3092,6 +3241,12 @@ function createServer(serverCwd) {
             "execpolicy_amendment is only allowed for action='respond_permission'."
           );
         }
+        if (value.network_policy_amendment !== void 0) {
+          addIssue(
+            "network_policy_amendment",
+            "network_policy_amendment is only allowed for action='respond_permission'."
+          );
+        }
         if (value.denyMessage !== void 0) {
           addIssue("denyMessage", "denyMessage is only allowed for action='respond_permission'.");
         }