progmune-runtime 3.3.1 → 3.3.2

package/dist/mcp-server.mjs

@@ -13,9 +13,13 @@ import { fileURLToPath } from "url";
 import { createLogger } from "./logger.js";
 // ── ESM-compatible __dirname (the compiled output is an .mjs module) ──
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-// ── Load .env ──
-const envPath = path.resolve(__dirname, "..", ".env");
-if (fs.existsSync(envPath)) {
+// ── Load .env（包目录 + 项目目录，后者优先） ──
+for (const envPath of [
+    path.resolve(process.env.PROGMUNE_PROJECT_DIR || process.cwd(), ".env"),
+    path.resolve(__dirname, "..", ".env"),
+]) {
+    if (!fs.existsSync(envPath))
+        continue;
     const envContent = fs.readFileSync(envPath, "utf-8");
     for (const line of envContent.split("\n")) {
         const trimmed = line.trim();
@@ -335,7 +339,7 @@ async function main() {
 
 Progmune needs an LLM API key to generate code. Configure via:
 
-  【.env file】Add to ${envPath}:
+  【.env file】Add to ${path.resolve(process.env.PROGMUNE_PROJECT_DIR || process.cwd(), ".env")}:
     LLM_API_KEY=your-key
     LLM_BASE_URL=https://api.deepseek.com/v1
     LLM_MODEL=deepseek-chat

package/dist/planner.js

@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateProtocolWithTransitions = validateProtocolWithTransitions;
 exports.plan = plan;
 const llm_1 = require("./llm");
 const runtime_types_1 = require("./runtime-types");
@@ -393,22 +394,41 @@ function validateProtocolWithTransitions(actions, protocols, namespaceInitialSta
     // End-of-sequence check: held resources must be released (resource leak).
     // A state S is resource-holding when some rule REQUIRES S and INVALIDATES S
     // (acquire/release semantics — e.g. FILE_OPEN set by open_file, released by
-    // close_file). UNAUTHENTICATED is not resource-holding (release rules for it
-    // do not require it as a precondition).
+    // close_file). Only RESOURCE-LIFECYCLE namespaces apply: session/auth flows
+    // legitimately END with an active session (SESSION_ACTIVE is not a leak).
+    const RESOURCE_NS = /^(file|db|database|connection|conn|socket|stream|resource|io)/i;
     const heldStates = [];
     for (const p of protocols) {
         const ann = p.protocol;
         if (!ann)
             continue;
+        const ns = ann.namespace || "";
+        if (!RESOURCE_NS.test(ns))
+            continue;
         const inv = ann.invalidate || [];
         const pre = ann.pre_states || [];
         for (const s of inv) {
             if (pre.includes(s))
-                heldStates.push({ state: s, releaseFn: p.function, namespace: ann.namespace || "" });
+                heldStates.push({ state: s, releaseFn: p.function, namespace: ns });
+        }
+    }
+    // 只检查"本序列中获取"的持有状态——继承自命名空间初始状态的
+    // （如 db 初始即 DB_CONNECTED）不算泄漏。
+    const acquiredStates = new Set();
+    for (const t of transitions) {
+        for (const ns of Object.keys(t.statesAfter || {})) {
+            const after = t.statesAfter[ns] || [];
+            const before = t.statesBefore?.[ns] || [];
+            for (const s of after) {
+                if (!before.includes(s))
+                    acquiredStates.add(`${ns}::${s}`);
+            }
         }
     }
     for (const hs of heldStates) {
         const cur = ctx.currentState[hs.namespace] || [];
+        if (!acquiredStates.has(`${hs.namespace}::${hs.state}`))
+            continue;
         if (cur.includes(hs.state)) {
             const trace = transitions.map(t => ({
                 function: t.function,
@@ -444,7 +464,11 @@ function validateProtocolWithTransitions(actions, protocols, namespaceInitialSta
     return { valid: true, transitions, ledgerConsistent: consistency.consistent, ruleHash };
 }
 /** SSG 确定性修复：当协议违规有已知修复路径时，自动插入缺失函数 */
-function attemptSSGRepair(actions, rejection, ir, protocols, namespaceInitialStates) {
+function attemptSSGRepair(actions, rejection, ir, protocols, namespaceInitialStates, depth = 0) {
+    if (depth > 5) {
+        console.error(`[修复] 递归深度超限 (${depth})，放弃确定性修复`);
+        return null;
+    }
     if (!rejection.fixPath || rejection.fixPath.length === 0)
         return null;
     // 名称归一化：内置规则可能是下划线风格（generate_jwt），项目 IR 是
@@ -496,7 +520,8 @@ function attemptSSGRepair(actions, rejection, ir, protocols, namespaceInitialSta
     }
     // 单步修复不够，尝试递归修复
     if (recheck.rejection && recheck.rejection.fixPath && recheck.rejection.fixPath.length > 0) {
-        const nested = attemptSSGRepair(repaired, recheck.rejection, ir, protocols, namespaceInitialStates);
+        console.error(`[修复] 重验仍失败 (blocked=${recheck.rejection.blocked}, fixPath=${recheck.rejection.fixPath.join(" → ")})，递归深度 ${depth + 1}`);
+        const nested = attemptSSGRepair(repaired, recheck.rejection, ir, protocols, namespaceInitialStates, depth + 1);
         if (nested)
             return nested;
     }
@@ -1079,6 +1104,13 @@ ${planner_prompts_1.RETRY_HINT}
             const protoResult = validateProtocolWithTransitions(filtered, protocols, namespaceInitialStates);
             if (!protoResult.valid && protoResult.rejection) {
                 const rej = protoResult.rejection;
+                // P3：fixPath / missingFunctions 归一化到 IR 真实函数名——
+                // 内置规则是下划线风格（generate_jwt），项目 IR 是 camelCase
+                // （generateJwt）。提示与记录使用项目里真实存在的名字。
+                const normIRName = (n) => ir.find((f) => f.name === n)
+                    || ir.find((f) => f.name.replace(/[_-]/g, "").toLowerCase() === n.replace(/[_-]/g, "").toLowerCase());
+                rej.fixPath = (rej.fixPath || []).map(n => normIRName(n)?.name || n);
+                rej.missingFunctions = (rej.missingFunctions || []).map(n => normIRName(n)?.name || n);
                 const explain = (0, ssg_validator_1.explainRejection)(rej);
                 console.error(explain);
                 const violation = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "progmune-runtime",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Progmune — AI Trust Decision Engine. Verify AI-generated code before it reaches production. Outputs APPROVED / NEEDS_REVIEW / BLOCKED with evidence.",
   "files": [
     "dist/",