agentlas 1.0.65 → 1.0.67

package/engine/experience/intents.cjs

@@ -13,23 +13,25 @@
  *  - 상태 파일은 <userData>/terminal/experience-intents-v1.json — v1과 동일
  *    포맷/경로. 쓰기는 0600 원자적 쓰기(임시파일+rename)만 사용한다.
  *
- * 검증 프리미티브(assert 계열, UNSAFE_TEXT_PATTERNS)는 engine/mcp/contract.cjs에도
- * 존재하지만, 의도 저장소는 mcp 서브시스템 변경과 독립적으로 보안 경계를
- * 유지해야 하므로 v1 원문을 여기 동결한다(우연한 규칙 완화 전파 방지).
+ * 검증 프리미티브(assert 계열, UNSAFE_TEXT_PATTERNS)는 MCP 계약과 분리해
+ * v1 원문을 여기 동결한다(우연한 규칙 완화 전파 방지). 파일 I/O와 lock은
+ * engine/mcp/contract.cjs의 공통 hardened primitive를 사용한다.
  */
 
 const crypto = require("node:crypto");
 const fs = require("node:fs");
 const path = require("node:path");
+const {
+  readJsonFile,
+  writePrivateJsonAtomic,
+  withPrivateStateLock,
+} = require("../mcp/contract.cjs");
 
 const ID_RE = /^[A-Za-z0-9][A-Za-z0-9._:/@-]{2,255}$/;
 const HASH_RE = /^sha256:[0-9a-f]{64}$/;
 const ENV_RE = /^[A-Z][A-Z0-9_]*$/;
 const EXPERIENCE_STATE_SCHEMA = "agentlas.terminal-experience-intents.v1";
 const EXPERIENCE_INTENT_SCHEMA = "agentlas.terminal-experience-intent.v1";
-const MAX_JSON_BYTES = 2 * 1024 * 1024;
-const EXPERIENCE_LOCK_STALE_MS = 30_000;
-const EXPERIENCE_LOCK_WAIT_MS = 2_000;
 
 const EXPERIENCE_PACK_REQUIRED = [
   "schemaVersion", "kind", "experiencePackId", "releaseId", "ownerRef", "version",
@@ -190,6 +192,12 @@ function validateExperiencePack(value) {
   assertUniqueIds(value.evidenceReceiptIds, "experience pack.evidenceReceiptIds");
   if (!Array.isArray(value.mcpRequirements) || value.mcpRequirements.length > 64) throw new Error("experience pack.mcpRequirements is invalid");
   value.mcpRequirements.forEach((requirement, index) => validateMcpRequirement(requirement, `experience pack.mcpRequirements[${index}]`));
+  const requirementIds = value.mcpRequirements.map((requirement) => requirement.requirementId);
+  if (new Set(requirementIds).size !== requirementIds.length) {
+    const error = new Error("experience pack.mcpRequirements requirementId values must be unique");
+    error.code = "duplicate_mcp_requirement_id";
+    throw error;
+  }
   // base 패키지 복사 반입 금지 — 참조만 허용(오너 결정, 완화 불가).
   if (value.containsBasePackageMaterial !== false) throw new Error("experience pack must reference the base release; copied base material is forbidden");
   if (!HASH_RE.test(String(value.contentHash || ""))) throw new Error("experience pack.contentHash is invalid");
@@ -199,75 +207,15 @@ function validateExperiencePack(value) {
   return value;
 }
 
-function readJsonFile(filePath, label) {
-  const absolute = path.resolve(filePath);
-  const stat = fs.lstatSync(absolute);
-  if (!stat.isFile() || stat.isSymbolicLink()) throw new Error(`${label} must be a regular file (symlinks are not accepted)`);
-  if (stat.size <= 0 || stat.size > MAX_JSON_BYTES) throw new Error(`${label} has an invalid size`);
-  let value;
-  try { value = JSON.parse(fs.readFileSync(absolute, "utf8")); } catch (error) { throw new Error(`${label} is not valid JSON: ${error.message}`); }
-  return { absolute, value };
-}
-
-function writePrivateJsonAtomic(filePath, value) {
-  const dir = path.dirname(filePath);
-  fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
-  try { fs.chmodSync(dir, 0o700); } catch { /* best effort */ }
-  const temp = path.join(dir, `.${path.basename(filePath)}.${process.pid}.${crypto.randomBytes(6).toString("hex")}.tmp`);
-  try {
-    fs.writeFileSync(temp, JSON.stringify(value, null, 2) + "\n", { encoding: "utf8", mode: 0o600, flag: "wx" });
-    fs.renameSync(temp, filePath);
-    try { fs.chmodSync(filePath, 0o600); } catch { /* best effort */ }
-  } finally {
-    try { fs.rmSync(temp, { force: true }); } catch { /* noop */ }
-  }
-}
-
 function experienceStatePath(userDataDir) {
   return path.join(userDataDir, "terminal", "experience-intents-v1.json");
 }
 
-function waitSync(milliseconds) {
-  // Atomics.wait은 지원 Node 20+에서 스핀 없이 대기하는 유일한 동기 sleep이다.
-  const signal = new Int32Array(new SharedArrayBuffer(4));
-  Atomics.wait(signal, 0, 0, milliseconds);
-}
-
 function withExperienceStateLock(userDataDir, action) {
-  const stateFile = experienceStatePath(userDataDir);
-  const dir = path.dirname(stateFile);
-  fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
-  try { fs.chmodSync(dir, 0o700); } catch { /* best effort */ }
-  const lockFile = `${stateFile}.lock`;
-  const deadline = Date.now() + EXPERIENCE_LOCK_WAIT_MS;
-  let descriptor = null;
-  while (descriptor == null) {
-    try {
-      descriptor = fs.openSync(lockFile, "wx", 0o600);
-      fs.writeFileSync(descriptor, `${process.pid}\n${new Date().toISOString()}\n`, "utf8");
-    } catch (error) {
-      if (!error || error.code !== "EEXIST") throw error;
-      try {
-        const stat = fs.lstatSync(lockFile);
-        if (!stat.isFile() || stat.isSymbolicLink()) throw new Error("Terminal experience lock is unsafe");
-        if (Date.now() - stat.mtimeMs > EXPERIENCE_LOCK_STALE_MS) {
-          fs.unlinkSync(lockFile);
-          continue;
-        }
-      } catch (statError) {
-        if (statError && statError.code === "ENOENT") continue;
-        throw statError;
-      }
-      if (Date.now() >= deadline) throw new Error("Terminal experience state is busy; retry the command");
-      waitSync(25);
-    }
-  }
-  try {
-    return action();
-  } finally {
-    try { fs.closeSync(descriptor); } catch { /* noop */ }
-    try { fs.unlinkSync(lockFile); } catch { /* crash recovery handles leftovers */ }
-  }
+  return withPrivateStateLock(experienceStatePath(userDataDir), {
+    unsafe: "Terminal experience lock is unsafe",
+    busy: "Terminal experience state is busy; retry the command",
+  }, action);
 }
 
 function emptyExperienceState() {
@@ -276,10 +224,12 @@ function emptyExperienceState() {
 
 function loadExperienceState(userDataDir) {
   const file = experienceStatePath(userDataDir);
-  if (!fs.existsSync(file)) return emptyExperienceState();
-  const stat = fs.lstatSync(file);
-  if (!stat.isFile() || stat.isSymbolicLink() || stat.size > MAX_JSON_BYTES) throw new Error("Terminal experience state is unsafe or too large");
-  const state = JSON.parse(fs.readFileSync(file, "utf8"));
+  let state;
+  try { ({ value: state } = readJsonFile(file, "Terminal experience state")); }
+  catch (error) {
+    if (error && error.code === "ENOENT") return emptyExperienceState();
+    throw error;
+  }
   assertExactKeys(state, new Set(["schemaVersion", "updatedAt", "intents"]), ["schemaVersion", "updatedAt", "intents"], "Terminal experience state");
   if (state.schemaVersion !== EXPERIENCE_STATE_SCHEMA || !Array.isArray(state.intents)) throw new Error("Terminal experience state schema is invalid");
   assertIsoDateOrNull(state.updatedAt, "Terminal experience state.updatedAt");
@@ -336,16 +286,16 @@ function publicExperienceIntent(intent) {
 
 function parseSimpleFlags(args) {
   const flags = { _: [] };
+  let passthrough = false;
   for (let index = 0; index < args.length; index += 1) {
     const token = String(args[index]);
-    if (token === "--json") flags.json = true;
-    else if (token.startsWith("--") && token.includes("=")) {
-      const at = token.indexOf("=");
-      flags[token.slice(2, at)] = token.slice(at + 1);
+    if (passthrough) { flags._.push(token); continue; }
+    if (token === "--") { passthrough = true; continue; }
+    if (token === "--json") {
+      if (flags.json === true) throw new Error("duplicate option: --json");
+      flags.json = true;
     } else if (token.startsWith("--")) {
-      const key = token.slice(2);
-      if (index + 1 < args.length && !String(args[index + 1]).startsWith("--")) flags[key] = String(args[++index]);
-      else flags[key] = true;
+      throw new Error(`unknown option: ${token}`);
     } else flags._.push(token);
   }
   return flags;
@@ -428,13 +378,14 @@ function cmdExperience(options) {
   const userData = options.userDataDir;
   if (!userData) throw new Error("Terminal userData path is required");
   if (sub === "list" || sub === "ls") {
+    if (flags._.length) throw new Error("usage: agentlas experience legacy-list [--json]");
     const list = loadExperienceState(userData).intents.map(publicExperienceIntent);
     emit(flags.json ? JSON.stringify({ localOnly: true, hubPublicationAttempted: false, intents: list }, null, 2) : renderExperienceList(list));
     return list;
   }
   if (sub === "inspect" || sub === "show") {
     const ref = flags._[0];
-    if (!ref) throw new Error("usage: agentlas experience inspect <pack-id|release-id|intent-id>");
+    if (!ref || flags._.length !== 1) throw new Error("usage: agentlas experience legacy-inspect <pack-id|release-id|intent-id> [--json]");
     const intent = findIntent(loadExperienceState(userData), ref);
     if (!intent) throw new Error(`local Experience Pack intent not found: ${ref}`);
     const projected = publicExperienceIntent(intent);
@@ -448,6 +399,7 @@ function cmdExperience(options) {
     return projected;
   }
   if (sub === "publish") {
+    if (flags._.length !== 1) throw new Error("usage: agentlas experience legacy-publish <experience-pack.json> [--json]");
     const intent = publishExperienceIntent(userData, flags._[0], options.cwd);
     emit(flags.json ? JSON.stringify(intent, null, 2) : [
       `Local publish intent saved: ${intent.experiencePackId}@${intent.version}`,
@@ -457,6 +409,7 @@ function cmdExperience(options) {
     return intent;
   }
   if (sub === "unpublish") {
+    if (flags._.length !== 1) throw new Error("usage: agentlas experience legacy-unpublish <pack-id|release-id|intent-id> [--json]");
     const intent = unpublishExperienceIntent(userData, flags._[0]);
     emit(flags.json ? JSON.stringify(intent, null, 2) : [
       `Local unpublish intent saved: ${intent.experiencePackId}@${intent.version}`,

package/engine/experience/runtime.cjs

@@ -23,6 +23,7 @@ const { tableExists } = require("../core/db.cjs");
 const { agentFolder } = require("../agents/files.cjs");
 const { routesMap } = require("../agents/routes.cjs");
 const terminalExperienceExchange = require("../agentlas-experience-exchange.cjs");
+const permissions = require("../agentlas-permissions.cjs");
 const terminalExperienceIntake = require("../agentlas-experience-intake.cjs");
 const desktopOntologyLoadout = require("../agentlas-desktop-loadout.cjs");
 
@@ -103,9 +104,14 @@ function exactAgentBaseForExecution(db, agent, runtimeExperience = null) {
   const packageHash = /^[a-f0-9]{64}$/.test(rawHash) ? `sha256:${rawHash}` : null;
   const explicitDefinition = String(runtimeExperience?.agentDefinitionId || "");
   const explicitRelease = String(runtimeExperience?.baseAgentReleaseId || "");
+  const hasExplicitBinding = !!runtimeExperience && (
+    Object.prototype.hasOwnProperty.call(runtimeExperience, "agentDefinitionId") ||
+    Object.prototype.hasOwnProperty.call(runtimeExperience, "baseAgentReleaseId")
+  );
   if (portableId.test(explicitDefinition) && portableId.test(explicitRelease)) {
     return { agentDefinitionId: explicitDefinition, agentReleaseId: explicitRelease, packageHash, authority: "explicit-runtime-binding" };
   }
+  if (hasExplicitBinding) return null;
   if (binding && portableId.test(String(binding.agent_definition_id)) && portableId.test(String(binding.agent_release_id))) {
     return { agentDefinitionId: binding.agent_definition_id, agentReleaseId: binding.agent_release_id, packageHash, authority: "installed-hub-binding" };
   }
@@ -185,7 +191,7 @@ function resolveRuntimeExperienceCli(agent, prompt, requested, cwd, overrides =
  * null — 적립이 실행 성공/실패 판정을 바꾸지 않는다.
  */
 function finalizeExperienceExecutionCli(db, input) {
-  if (input.permission === "read") return null;
+  if (permissions.normalize(input.permission) === "read") return null;
   if (!input.agentId) return null;
   let agent;
   try { agent = db.prepare("SELECT * FROM installed_agents WHERE id=?").get(input.agentId); }

package/engine/experience/variant.cjs

@@ -21,11 +21,52 @@ const {
   assertObject,
   assertExactKeys,
   assertId,
+  assertSafeText,
   validateMcpRequirement,
   readJsonFile,
-  parseSimpleFlags,
 } = require("./intents.cjs");
 
+const MAX_VARIANT_CANDIDATES = 512;
+
+function parseVariantFlags(args) {
+  const flags = { _: [] };
+  const seen = new Set();
+  const valueFlags = new Set(["base-release", "prefer", "candidates"]);
+  const booleanFlags = new Set(["json", "no-base-only"]);
+  let positionalOnly = false;
+  for (let index = 0; index < args.length; index += 1) {
+    const token = String(args[index]);
+    if (positionalOnly) {
+      flags._.push(token);
+      continue;
+    }
+    if (token === "--") {
+      positionalOnly = true;
+      continue;
+    }
+    if (!token.startsWith("--")) {
+      flags._.push(token);
+      continue;
+    }
+    const at = token.indexOf("=");
+    const key = token.slice(2, at < 0 ? undefined : at);
+    if (!valueFlags.has(key) && !booleanFlags.has(key)) throw new Error(`unknown variant option: --${key}`);
+    if (seen.has(key)) throw new Error(`duplicate variant option: --${key}`);
+    seen.add(key);
+    if (booleanFlags.has(key)) {
+      if (at >= 0) throw new Error(`--${key} does not take a value`);
+      flags[key] = true;
+      continue;
+    }
+    const value = at >= 0 ? token.slice(at + 1) : String(args[++index] ?? "");
+    if (!value || (at < 0 && value.startsWith("--"))) throw new Error(`--${key} requires a value`);
+    flags[key] = value;
+  }
+  if (flags._.length > 1) throw new Error("variant resolve accepts at most one candidates.json path");
+  if (flags.candidates && flags._.length) throw new Error("choose either --candidates or a positional candidates.json path");
+  return flags;
+}
+
 function validateVariantCandidate(candidate, index) {
   const allowed = new Set(["variantId", "baseAgentReleaseId", "experiencePackReleaseId", "status", "compatibilityStatus", "score", "mcpRequirements"]);
   assertExactKeys(candidate, allowed, ["variantId", "baseAgentReleaseId", "experiencePackReleaseId", "status", "compatibilityStatus", "score", "mcpRequirements"], `candidate[${index}]`);
@@ -39,15 +80,19 @@ function validateVariantCandidate(candidate, index) {
     variantId: candidate.variantId,
     baseAgentReleaseId: candidate.baseAgentReleaseId,
     experiencePackReleaseId: candidate.experiencePackReleaseId,
-    status: String(candidate.status || "draft"),
-    compatibilityStatus: String(candidate.compatibilityStatus || "unverified"),
+    status: assertSafeText(candidate.status || "draft", `candidate[${index}].status`, 64),
+    compatibilityStatus: assertSafeText(candidate.compatibilityStatus || "unverified", `candidate[${index}].compatibilityStatus`, 64),
     score,
     mcpRequirements: requirements,
   };
 }
 
 function resolveVariantCandidates(options) {
+  if (!options || !Array.isArray(options.candidates || [])) throw new Error("variant candidates must be an array");
+  if ((options.candidates || []).length > MAX_VARIANT_CANDIDATES) throw new Error("too many variant candidates");
   const candidates = (options.candidates || []).map(validateVariantCandidate);
+  const candidateIds = candidates.map((candidate) => candidate.variantId);
+  if (new Set(candidateIds).size !== candidateIds.length) throw new Error("variantId values must be unique");
   const inventoryById = indexInventory(options.inventory || []);
   if (!options.baseAgentReleaseId) {
     return {
@@ -67,6 +112,8 @@ function resolveVariantCandidates(options) {
       requiredMcpFailureScope: "variant-only",
     };
   }
+  assertId(options.baseAgentReleaseId, "baseAgentReleaseId");
+  if (options.preferredVariantId) assertId(options.preferredVariantId, "preferredVariantId");
   const excluded = [];
   const eligible = [];
   for (const candidate of candidates) {
@@ -202,7 +249,7 @@ function cmdVariant(options) {
     return null;
   }
   if (sub !== "resolve") throw new Error(`unknown variant subcommand: ${sub} (resolve|help)`);
-  const flags = parseSimpleFlags(args.slice(1));
+  const flags = parseVariantFlags(args.slice(1));
   let candidates = [];
   let baseAgentReleaseId = flags["base-release"] || null;
   const candidateFile = flags.candidates || flags._[0];
@@ -211,6 +258,12 @@ function cmdVariant(options) {
     if (Array.isArray(value)) candidates = value;
     else {
       assertObject(value, "variant candidate document");
+      assertExactKeys(
+        value,
+        new Set(["baseAgentReleaseId", "candidates"]),
+        ["candidates"],
+        "variant candidate document",
+      );
       if (!Array.isArray(value.candidates)) throw new Error("variant candidate document must contain candidates[]");
       candidates = value.candidates;
       if (!baseAgentReleaseId && value.baseAgentReleaseId) baseAgentReleaseId = value.baseAgentReleaseId;
@@ -236,5 +289,6 @@ module.exports = {
   resolveVariantCandidates,
   renderVariantResolution,
   variantUsage,
+  parseVariantFlags,
   cmdVariant,
 };

package/engine/firms/orchestrate.cjs

@@ -238,7 +238,9 @@ async function parallelCap(items, cap, fn) {
 }
 
 function isVerificationDivision(node) {
-  const label = `${node && node.role || ""} ${node && node.name || ""} ${node && node.key || ""}`
+  // key에는 `<firm-slug>:` 접두사가 들어간다. 회사 이름이 `firm-test`/`qa-studio`인
+  // 것만으로 모든 본부를 검증 본부로 오분류하면 구현 슬롯이 하나도 실행되지 않는다.
+  const label = `${node && node.role || ""} ${node && node.name || ""}`
     .toLowerCase()
     .replace(/[_-]+/g, " ");
   return /\b(?:eval|qa|quality|test|verification|verifier)\b|policy\s+gate/.test(label);
@@ -278,9 +280,9 @@ function verificationResultOk(text, sessionOk) {
   if (!sessionOk) return false;
   const source = String(text || "").trim();
   const explicit = source.match(/<verification_verdict>\s*(PASS|FAIL)\s*<\/verification_verdict>/i);
-  if (explicit) return explicit[1].toUpperCase() === "PASS";
-  const opening = source.slice(0, 900);
-  return !/(?:\bverdict\s*:\s*fail\b|\brelease[- ]blocking\b|\bnot complete\b|\bcannot truthfully\b|\bno[- ]go\b|\bblocking defect\b)/i.test(opening);
+  // 검증 프롬프트가 요구한 machine-readable verdict가 유일한 성공 근거다.
+  // 본문 어조로 성공을 추측하면 태그를 빠뜨린 응답이나 명시적 FAIL까지 통과할 수 있다.
+  return Boolean(explicit && explicit[1].toUpperCase() === "PASS");
 }
 
 function latestResultsAllOk(results) {
@@ -400,9 +402,10 @@ async function runFirmTurn(p) {
             ? `${m.brief || task}\n\n[Release-blocking repair stage]\nIndependent verification found the following failures in the current integrated product. Inspect the evidence and current files, repair the actual shipped experience, and rerun the relevant checks before returning. Do not merely describe the fix.\n${stageContext}`
             : (m.brief || task);
       const res = await session.send(prompt);
-      text = cleanFenceText(turnText(res));
+      const rawText = turnText(res);
+      text = cleanFenceText(rawText);
       ok = stageKind === "verification"
-        ? verificationResultOk(text, session.status === "done")
+        ? verificationResultOk(rawText, session.status === "done")
         : session.status === "done";
       if (!ok && !text) text = session.lastError || "no response";
     } catch (e) {

package/engine/graph/ask-model.cjs

@@ -61,7 +61,7 @@ function consentedMcpServersFor(ctx) {
   try {
     const mcp = require("../mcp/index.cjs");
     if (typeof mcp.readConsentedSystemMcpServers !== "function") return [];
-    return mcp.readConsentedSystemMcpServers(ctx.db(), { env: process.env }) || [];
+    return mcp.readConsentedSystemMcpServers(ctx.db(), { env: process.env, createRuntimeHome: false }) || [];
   } catch {
     return [];
   }
@@ -85,7 +85,7 @@ async function askModel(ctx, prompt, opts = {}) {
 
   // 시도 순서: 사용자가 정한 것 먼저, 그다음 이 컴퓨터에 있는 나머지.
   const candidates = [];
-  if (primary && primary.kind && primary.bin) candidates.push(primary);
+  if (primary && primary.kind && (primary.bin || primary.kind === "ollama")) candidates.push(primary);
   if (!opts.runtime) {
     // listAvailableCliRuntimes()는 문자열이 아니라 {kind, bin, path} 객체를 돌려준다.
     // 문자열로 읽으면 후보가 하나도 안 쌓여 폴백이 통째로 죽는다(실측).
@@ -114,12 +114,23 @@ async function askModel(ctx, prompt, opts = {}) {
   for (const runtime of candidates) {
     let res;
     try {
-      res = await nativeHost.runNativeTurn({
-        kind: runtime.kind,
-        bin: runtime.bin,
-        ui: quietSink(),
-        cwd: opts.cwd || process.cwd(),
-        prompt,
+      const cwd = opts.cwd || process.cwd();
+      const ui = quietSink();
+      res = runtime.kind === "ollama"
+        ? await require("../agentlas-api-agent.cjs").runApiTurn({
+          backend: "ollama",
+          model: runtime.model || "llama3.1",
+          system: "",
+          messages: [{ role: "user", content: prompt }],
+          ctx: { cwd, permission: "read", env: process.env, db },
+          ui,
+        })
+        : await nativeHost.runNativeTurn({
+          kind: runtime.kind,
+          bin: runtime.bin,
+          ui,
+          cwd,
+          prompt,
         /*
          * 읽기 권한 — 만드는 동안 바깥을 바꾸지 않는다. 메일이 나가거나 글이 올라가면 안 된다.
          * ★런타임의 "read"는 **쓰기 금지가 아니라 도구 금지에 가깝다**(이 저장소 실측:
@@ -140,9 +151,9 @@ async function askModel(ctx, prompt, opts = {}) {
          *   새로 동의를 받지 않는다 — 이미 받아 둔 것만 그대로 쓴다(consent 영수증 기준).
          *   못 읽으면 빈 배열로 간다: 예전과 같아질 뿐 나빠지지 않는다.
          */
-        mcpServers: consentedMcpServersFor(ctx),
-        mcpAllowlistMode: "exact",
-      });
+          mcpServers: consentedMcpServersFor(ctx),
+          mcpAllowlistMode: "exact",
+        });
     } catch (err) {
       failures.push(`${runtime.kind}: ${(err && err.message) || err}`);
       continue;