@gethmy/mcp 2.23.0 → 2.25.0

package/dist/index.js

@@ -20,7 +20,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 // src/config.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir } from "node:os";
-import { join as join2 } from "node:path";
+import { dirname, join as join2, parse, resolve } from "node:path";
 function getConfigDir() {
   return join2(homedir(), ".harmony-mcp");
 }
@@ -30,6 +30,22 @@ function getConfigPath() {
 function getLocalConfigPath(cwd) {
   return join2(cwd || process.cwd(), LOCAL_CONFIG_FILENAME);
 }
+function findLocalConfigPath(cwd) {
+  const home = resolve(homedir());
+  let dir = resolve(cwd || process.cwd());
+  const { root } = parse(dir);
+  for (;; ) {
+    if (dir !== home && dir !== root) {
+      const candidate = join2(dir, LOCAL_CONFIG_FILENAME);
+      if (existsSync2(candidate))
+        return candidate;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      return null;
+    dir = parent;
+  }
+}
 function emptyConfig() {
   return {
     apiKey: null,
@@ -81,8 +97,8 @@ function saveConfig(config) {
   });
 }
 function loadLocalConfig(cwd) {
-  const localConfigPath = getLocalConfigPath(cwd);
-  if (!existsSync2(localConfigPath)) {
+  const localConfigPath = findLocalConfigPath(cwd);
+  if (localConfigPath === null) {
     return null;
   }
   try {
@@ -97,7 +113,7 @@ function loadLocalConfig(cwd) {
   }
 }
 function saveLocalConfig(config, cwd) {
-  const localConfigPath = getLocalConfigPath(cwd);
+  const localConfigPath = findLocalConfigPath(cwd) ?? getLocalConfigPath(cwd);
   const existingConfig = loadLocalConfig(cwd) || {
     workspaceId: null,
     projectId: null
@@ -111,7 +127,7 @@ function saveLocalConfig(config, cwd) {
   writeFileSync2(localConfigPath, JSON.stringify(cleanConfig, null, 2));
 }
 function hasLocalConfig(cwd) {
-  return existsSync2(getLocalConfigPath(cwd));
+  return findLocalConfigPath(cwd) !== null;
 }
 function getActiveCredential() {
   const config = loadConfig();
@@ -133,33 +149,69 @@ function getUserEmail() {
   const config = loadConfig();
   return config.userEmail;
 }
-function setActiveWorkspace(workspaceId, options) {
-  if (options?.local) {
-    saveLocalConfig({ workspaceId }, options.cwd);
-  } else {
-    saveConfig({ activeWorkspaceId: workspaceId });
+function setActiveContext(context, options) {
+  if (options?.global) {
+    saveConfig({
+      activeWorkspaceId: context.workspaceId,
+      activeProjectId: context.projectId
+    });
+    return;
   }
-}
-function setActiveProject(projectId, options) {
-  if (options?.local) {
-    saveLocalConfig({ projectId }, options.cwd);
+  const localPath = findLocalConfigPath(options?.cwd);
+  if (options?.local || localPath !== null) {
+    saveLocalConfig({ workspaceId: context.workspaceId, projectId: context.projectId }, options?.cwd);
   } else {
-    saveConfig({ activeProjectId: projectId });
+    saveConfig({
+      activeWorkspaceId: context.workspaceId,
+      activeProjectId: context.projectId
+    });
   }
 }
-function getActiveWorkspaceId(cwd) {
+function setActiveWorkspace(workspaceId, options) {
+  const currentWorkspaceId = getActiveWorkspaceId(options?.cwd);
+  const keepProject = currentWorkspaceId === workspaceId;
+  setActiveContext({
+    workspaceId,
+    projectId: keepProject ? getActiveProjectId(options?.cwd) : null
+  }, options);
+}
+function readActiveContext(cwd) {
   const localConfig = loadLocalConfig(cwd);
-  if (localConfig?.workspaceId) {
-    return localConfig.workspaceId;
+  if (localConfig) {
+    return {
+      workspaceId: localConfig.workspaceId ?? null,
+      projectId: localConfig.projectId ?? null
+    };
   }
-  return loadConfig().activeWorkspaceId;
+  const globalConfig = loadConfig();
+  return {
+    workspaceId: globalConfig.activeWorkspaceId,
+    projectId: globalConfig.activeProjectId
+  };
+}
+function getActiveWorkspaceId(cwd) {
+  return readActiveContext(cwd).workspaceId;
 }
 function getActiveProjectId(cwd) {
-  const localConfig = loadLocalConfig(cwd);
-  if (localConfig?.projectId) {
-    return localConfig.projectId;
+  return readActiveContext(cwd).projectId;
+}
+function getActiveContext(cwd) {
+  return describeActiveContext({
+    projectId: getActiveProjectId(cwd),
+    workspaceId: getActiveWorkspaceId(cwd)
+  });
+}
+function describeActiveContext(context) {
+  const { projectId, workspaceId } = context;
+  if (projectId && !workspaceId) {
+    return {
+      projectId,
+      workspaceId,
+      consistent: false,
+      note: `An active project (${projectId}) is set with no active workspace, so ` + "workspace-scoped tools cannot resolve one from it. Re-set it with " + "harmony_set_project_context, or pass workspaceId explicitly."
+    };
   }
-  return loadConfig().activeProjectId;
+  return { projectId, workspaceId, consistent: true, note: null };
 }
 function isConfigured() {
   const config = loadConfig();
@@ -302,15 +354,7 @@ ${lines.join(`
 `)}`;
 }
 function generatePrompt(options) {
-  const {
-    card,
-    column,
-    variant,
-    customConstraints,
-    memories,
-    assembledContext,
-    assemblyId
-  } = options;
+  const { card, column, variant, customConstraints, memories, assemblyId } = options;
   const contextOpts = {
     includeTitle: true,
     includeDescription: true,
@@ -388,10 +432,7 @@ ${card.description}`);
   roleFraming.outputSuggestions.forEach((s) => {
     sections.push(`- ${s}`);
   });
-  if (assembledContext) {
-    sections.push(`
-${assembledContext}`);
-  } else if (memories && memories.length > 0) {
+  if (memories && memories.length > 0) {
     sections.push(`
 ## Relevant Memories`);
     sections.push(`*${memories.length} memories recalled from knowledge graph:*`);
@@ -402,7 +443,7 @@ ${assembledContext}`);
       sections.push(memory.content);
     }
   }
-  const oneThingLine = synthesizeOneThing(card, subtasks, links, assembledContext);
+  const oneThingLine = synthesizeOneThing(card, subtasks, links);
   if (oneThingLine) {
     sections.push(`
 ## Recommended Next Step
@@ -429,7 +470,7 @@ ${customConstraints}`);
 *Card #${card.short_id} | Generated for ${variant} mode*`);
   const prompt = sections.join(`
 `);
-  const memoryCount = assembledContext ? (assembledContext.match(/^### /gm) || []).length : memories?.length || 0;
+  const memoryCount = memories?.length ?? 0;
   return {
     prompt,
     variant,
@@ -450,40 +491,7 @@ ${customConstraints}`);
     version: PROMPT_TEMPLATE_VERSION
   };
 }
-function extractSessionInsights(assembledContext) {
-  const result = {
-    lastSessionStatus: null,
-    lastSessionTask: null,
-    lastSessionProgress: null,
-    blockers: [],
-    procedureNextStep: null
-  };
-  const sessionMatches = assembledContext.match(/### Session:.*?\n([\s\S]*?)(?=\n###|\n## |\n---|\n\*Assembly|$)/g);
-  if (sessionMatches && sessionMatches.length > 0) {
-    const latest = sessionMatches[0];
-    if (/Completed work on/i.test(latest)) {
-      result.lastSessionStatus = "completed";
-    } else if (/Paused work on|status:\s*paused/i.test(latest)) {
-      result.lastSessionStatus = "paused";
-    }
-    const taskMatch = latest.match(/Final task:\s*(.+)/);
-    if (taskMatch)
-      result.lastSessionTask = taskMatch[1].trim();
-    const progressMatch = latest.match(/Progress:\s*(\d+)%/);
-    if (progressMatch)
-      result.lastSessionProgress = parseInt(progressMatch[1], 10);
-  }
-  const blockerMatches = assembledContext.match(/(?:blocker|blocked by|blocking):\s*(.+)/gi);
-  if (blockerMatches) {
-    result.blockers = blockerMatches.map((m) => m.replace(/(?:blocker|blocked by|blocking):\s*/i, "").trim());
-  }
-  const stepMatches = assembledContext.match(/^\d+\.\s+(?!.*\*\*\[key step\]\*\*.*✓)(.+?)(?:\s*\*\*\[key step\]\*\*)?$/gm);
-  if (stepMatches && stepMatches.length > 0) {
-    result.procedureNextStep = stepMatches[0].replace(/^\d+\.\s+/, "").replace(/\s*\*\*\[key step\]\*\*.*$/, "").trim();
-  }
-  return result;
-}
-function synthesizeOneThing(card, subtasks, links, assembledContext) {
+function synthesizeOneThing(card, subtasks, links) {
   if (card.done)
     return null;
   const blockers = links.filter((l) => l.display_type === "is_blocked_by" && l.direction === "incoming");
@@ -491,14 +499,6 @@ function synthesizeOneThing(card, subtasks, links, assembledContext) {
     const blocker = blockers[0];
     return `Unblock first: resolve #${blocker.target_card.short_id} "${blocker.target_card.title}" which is blocking this card.`;
   }
-  const session = assembledContext ? extractSessionInsights(assembledContext) : null;
-  if (session?.blockers && session.blockers.length > 0) {
-    return `Resolve blocker: ${session.blockers[0]}`;
-  }
-  if (session?.lastSessionStatus === "paused" && session.lastSessionTask) {
-    const progress = session.lastSessionProgress ? ` (was ${session.lastSessionProgress}% complete)` : "";
-    return `Resume previous session${progress}: "${session.lastSessionTask}".`;
-  }
   if (subtasks.length > 0) {
     const completed = subtasks.filter((s) => s.completed).length;
     if (completed === subtasks.length) {
@@ -509,12 +509,6 @@ function synthesizeOneThing(card, subtasks, links, assembledContext) {
       return `Work on next subtask: "${nextSubtask.title}" (${completed}/${subtasks.length} done).`;
     }
   }
-  if (session?.procedureNextStep) {
-    return `Follow procedure: ${session.procedureNextStep}`;
-  }
-  if (session?.lastSessionStatus === "completed" && session.lastSessionTask) {
-    return `Previous session completed ("${session.lastSessionTask}"). Review results and continue with remaining work.`;
-  }
   if (card.due_date && (card.priority === "urgent" || card.priority === "high")) {
     return `High-priority task with deadline ${card.due_date}. Start implementation immediately.`;
   }
@@ -878,7 +872,7 @@ function lockPath() {
   return join3(getConfigDir(), LOCK_FILENAME);
 }
 function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
 async function withRefreshLock(fn) {
   const path = lockPath();
@@ -1381,6 +1375,9 @@ import {
   ReadResourceRequestSchema
 } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
+
+// src/api-client.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
 // ../harmony-shared/dist/agentStaleness.js
 var AGENT_HEARTBEAT_LIVENESS_MS = 5 * 60 * 1000;
 var AGENT_MILESTONE_LIVENESS_MS = 30 * 60 * 1000;
@@ -1502,12 +1499,97 @@ var TIMINGS = {
   QUERY_STALE_TIME: 1000 * 60 * 5,
   QUERY_GC_TIME: 1000 * 60 * 60 * 24
 };
+// ../harmony-shared/dist/declaredGateMetrics.js
+function declaredGateMetricsFromAgents(agents) {
+  const names = new Set;
+  let known = false;
+  for (const agent of agents) {
+    const declared = agent.declared_gate_metrics;
+    if (!Array.isArray(declared))
+      continue;
+    known = true;
+    for (const name of declared) {
+      if (typeof name === "string" && name.trim())
+        names.add(name.trim());
+    }
+  }
+  return { names, known };
+}
+// ../harmony-shared/dist/gateConfigError.js
+var GATE_CONFIG_ERROR_KEY = "configError";
+var GATE_CONFIG_ERROR_MARK = Object.freeze({ [GATE_CONFIG_ERROR_KEY]: true });
 // ../harmony-shared/dist/playbookStage.js
+var DEFAULT_LOOP_MAX_ITERATIONS = 5;
+function normalizeLoopDef(raw) {
+  if (raw === null || typeof raw !== "object" || Array.isArray(raw))
+    return null;
+  const obj = raw;
+  if (obj.mode !== "converge" && obj.mode !== "fanout")
+    return null;
+  const mode = obj.mode;
+  const rawMax = obj.max_iterations;
+  const maxInt = typeof rawMax === "number" && Number.isFinite(rawMax) && rawMax >= 1 ? Math.floor(rawMax) : DEFAULT_LOOP_MAX_ITERATIONS;
+  const exitGate = obj.exit_gate && typeof obj.exit_gate === "object" && !Array.isArray(obj.exit_gate) ? obj.exit_gate : null;
+  const def = { mode, max_iterations: maxInt };
+  if (exitGate)
+    def.exit_gate = exitGate;
+  if (obj.item_source && typeof obj.item_source === "object" && !Array.isArray(obj.item_source)) {
+    def.item_source = obj.item_source;
+  }
+  if (typeof obj.concurrency === "number" && obj.concurrency >= 1) {
+    def.concurrency = Math.floor(obj.concurrency);
+  }
+  if (obj.on_item_fail === "continue" || obj.on_item_fail === "halt") {
+    def.on_item_fail = obj.on_item_fail;
+  }
+  return def;
+}
+function readStageDefs(def) {
+  if (def.steps_version !== 2)
+    return [];
+  return Array.isArray(def.steps) ? def.steps : [];
+}
 var STAGE_DAEMON_OWNED_TOOLS = [
   "mcp__harmony__harmony_end_agent_session",
   "mcp__harmony__harmony_start_agent_session",
   "mcp__harmony__harmony_move_card"
 ];
+function customGateMetric(gate) {
+  if (gate === null || typeof gate !== "object" || Array.isArray(gate)) {
+    return null;
+  }
+  const record = gate;
+  if (record.kind !== "custom")
+    return null;
+  if (record.pendingEngine === true)
+    return null;
+  const metric = typeof record.metric === "string" ? record.metric.trim() : "";
+  return metric ? metric : null;
+}
+function referencedGateMetrics(def) {
+  const out = [];
+  for (const stage of readStageDefs(def)) {
+    if (!stage || typeof stage !== "object")
+      continue;
+    const stageId = typeof stage.id === "string" ? stage.id : "";
+    const stageName = typeof stage.name === "string" ? stage.name : stageId;
+    const gateMetric = customGateMetric(stage.gate);
+    if (gateMetric) {
+      out.push({ stageId, stageName, metric: gateMetric, source: "gate" });
+    }
+    const loop = normalizeLoopDef(stage.loop);
+    const loopMetric = loop?.exit_gate ? customGateMetric(loop.exit_gate) : null;
+    if (loopMetric) {
+      out.push({
+        stageId,
+        stageName,
+        metric: loopMetric,
+        source: "loop_exit_gate"
+      });
+    }
+  }
+  return out;
+}
 // ../harmony-shared/dist/reviewTools.js
 var REVIEW_DISALLOWED_TOOLS = [
   ...STAGE_DAEMON_OWNED_TOOLS,
@@ -1541,7 +1623,20 @@ function getRetryDelay(attempt) {
   const delay = Math.min(RETRY_CONFIG.baseDelayMs * 2 ** attempt, RETRY_CONFIG.maxDelayMs);
   return Math.round(delay + delay * 0.25 * (Math.random() * 2 - 1));
 }
-var sleep2 = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var sleep2 = (ms) => new Promise((resolve2) => setTimeout(resolve2, ms));
+function buildMemoryQuery(title, description) {
+  const DESCRIPTION_CAP = 600;
+  const trimmedTitle = title.trim();
+  const trimmedBody = (description ?? "").trim();
+  if (!trimmedTitle && !trimmedBody)
+    return "";
+  if (!trimmedTitle)
+    return trimmedBody.slice(0, DESCRIPTION_CAP);
+  if (!trimmedBody)
+    return trimmedTitle;
+  return `${trimmedTitle}
+${trimmedBody.slice(0, DESCRIPTION_CAP)}`;
+}
 
 class Semaphore {
   permits;
@@ -1554,7 +1649,7 @@ class Semaphore {
       this.permits--;
       return;
     }
-    return new Promise((resolve) => this.queue.push(resolve));
+    return new Promise((resolve2) => this.queue.push(resolve2));
   }
   release() {
     const next = this.queue.shift();
@@ -2012,6 +2107,14 @@ class HarmonyApiClient {
     params.set("sinceSeq", String(sinceSeq));
     return this.request("GET", `/cards/${cardId}/agent-messages?${params.toString()}`);
   }
+  async postBudgetDecision(cardId, data) {
+    return this.request("POST", `/cards/${cardId}/budget-decisions`, data);
+  }
+  async getBudgetDecisions(cardId, sinceIso) {
+    const params = new URLSearchParams;
+    params.set("sinceIso", sinceIso);
+    return this.request("GET", `/cards/${cardId}/budget-decisions?${params.toString()}`);
+  }
   async updateAgentProgress(cardId, data) {
     return this.request("POST", `/cards/${cardId}/agent-context`, data);
   }
@@ -2057,6 +2160,8 @@ class HarmonyApiClient {
       params.set("offset", String(options.offset));
     if (options.include_superseded)
       params.set("include_superseded", "true");
+    if (options.consumer)
+      params.set("consumer", options.consumer);
     if (options.include_episodes)
       params.set("include_episodes", "true");
     return this.request("GET", `/memory/entities?${params.toString()}`);
@@ -2112,6 +2217,12 @@ class HarmonyApiClient {
     if (options.topK !== undefined) {
       entities = entities.slice(0, options.topK);
     }
+    if (options.consumer) {
+      const deliveredIds = entities.map((e) => e.id).filter((id) => typeof id === "string");
+      if (deliveredIds.length > 0) {
+        this.batchTouchMemoryEntities(deliveredIds, options.consumer).catch(() => {});
+      }
+    }
     return { entities };
   }
   async deleteMemoryEntity(entityId) {
@@ -2120,9 +2231,10 @@ class HarmonyApiClient {
   async touchMemoryEntity(entityId) {
     return this.request("POST", `/memory/entities/${entityId}/touch`);
   }
-  async batchTouchMemoryEntities(entityIds) {
+  async batchTouchMemoryEntities(entityIds, consumer) {
     return this.request("POST", "/memory/entities/batch-touch", {
-      entity_ids: entityIds
+      entity_ids: entityIds,
+      ...consumer ? { consumer } : {}
     });
   }
   async createMemoryRelation(data) {
@@ -2148,8 +2260,12 @@ class HarmonyApiClient {
       params.append("tags", tag);
     if (options?.include_superseded)
       params.set("include_superseded", "true");
+    if (options?.consumer)
+      params.set("consumer", options.consumer);
     if (options?.include_episodes)
       params.set("include_episodes", "true");
+    if (options?.assembly_id)
+      params.set("assembly_id", options.assembly_id);
     return this.request("GET", `/memory/search?${params.toString()}`);
   }
   async getVaultIndex(options) {
@@ -2161,6 +2277,8 @@ class HarmonyApiClient {
       params.set("type", options.type);
     if (options.limit !== undefined)
       params.set("limit", String(options.limit));
+    if (options.consumer)
+      params.set("consumer", options.consumer);
     if (options.include_episodes)
       params.set("include_episodes", "true");
     return this.request("GET", `/memory/index?${params.toString()}`);
@@ -2174,6 +2292,8 @@ class HarmonyApiClient {
       params.set("type", options.type);
     if (options.limit !== undefined)
       params.set("limit", String(options.limit));
+    if (options.consumer)
+      params.set("consumer", options.consumer);
     if (options.include_episodes)
       params.set("include_episodes", "true");
     return this.requestRaw("GET", `/memory/index?${params.toString()}`, undefined, {
@@ -2233,6 +2353,8 @@ class HarmonyApiClient {
       params.set("type", options.type);
     if (options?.limit !== undefined)
       params.set("limit", String(options.limit));
+    if (options?.consumer)
+      params.set("consumer", options.consumer);
     if (options?.include_episodes)
       params.set("include_episodes", "true");
     return this.requestRaw("GET", `/memory/search?${params.toString()}`, undefined, {
@@ -2338,14 +2460,15 @@ class HarmonyApiClient {
       } catch {}
     }
     const variant = options.variant || "execute";
-    const assembledContextStr = undefined;
-    const assemblyId = undefined;
+    const assemblyId = randomUUID2();
     let memories;
     try {
       if (options.workspaceId && cardData.title) {
-        const memoryResult = await this.searchMemoryEntities(options.workspaceId, cardData.title, {
+        const memoryResult = await this.searchMemoryEntities(options.workspaceId, buildMemoryQuery(cardData.title, cardData.description), {
           project_id: options.projectId,
-          limit: 5
+          limit: 5,
+          consumer: "agent-prompt",
+          assembly_id: assemblyId
         });
         if (memoryResult.entities?.length > 0) {
           memories = memoryResult.entities.map((e) => ({
@@ -2369,7 +2492,6 @@ class HarmonyApiClient {
       contextOptions: options.contextOptions,
       customConstraints: options.customConstraints,
       memories,
-      assembledContext: assembledContextStr,
       assemblyId
     });
     try {
@@ -2700,7 +2822,7 @@ async function autoExpandGraph(client3, entityId, title, content, _tags, workspa
     });
     candidates = entities.filter((e) => e.id !== entityId && (e.confidence ?? 1) >= 0.4).slice(0, maxRelations);
     if (candidates.length === 0) {
-      await new Promise((resolve) => setTimeout(resolve, 2000));
+      await new Promise((resolve2) => setTimeout(resolve2, 2000));
       const retry = await client3.searchMemoryEntities(workspaceId, query, {
         project_id: projectId,
         limit: 20
@@ -3283,6 +3405,34 @@ async function onboardNewUser(params) {
   };
 }
 
+// src/playbook-metric-warnings.ts
+function playbookMetricWarnings(agents, steps) {
+  if (!Array.isArray(steps))
+    return [];
+  const declared = declaredGateMetricsFromAgents(agents);
+  if (!declared.known)
+    return [];
+  const warnings = [];
+  const seen = new Set;
+  for (const ref of referencedGateMetrics({ steps, steps_version: 2 })) {
+    if (declared.names.has(ref.metric) || seen.has(ref.metric))
+      continue;
+    seen.add(ref.metric);
+    warnings.push(`Gate metric "${ref.metric}" (stage "${ref.stageName}") is not declared by any agent in this workspace — a stage run gating on it will hold until a daemon declares it under agent.playbooks.metrics.${ref.metric}.`);
+  }
+  return warnings;
+}
+async function collectPlaybookMetricWarnings(client3, workspaceId, steps) {
+  if (!workspaceId || !Array.isArray(steps))
+    return [];
+  try {
+    const { agents } = await client3.listWorkspaceAgents(workspaceId);
+    return playbookMetricWarnings(agents, steps);
+  } catch {
+    return [];
+  }
+}
+
 // src/skills.ts
 import {
   existsSync as existsSync4,
@@ -3292,7 +3442,7 @@ import {
   writeFileSync as writeFileSync3
 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { dirname, join as join5 } from "node:path";
+import { dirname as dirname2, join as join5 } from "node:path";
 init_config();
 
 // src/hmy-config.ts
@@ -3439,7 +3589,7 @@ function stripSkillPreamble(content) {
 `;
 }
 function atomicWrite(filePath, content) {
-  const dir = dirname(filePath);
+  const dir = dirname2(filePath);
   if (!existsSync4(dir))
     mkdirSync3(dir, { recursive: true });
   const tmp = `${filePath}.tmp-${process.pid}-${Date.now()}`;
@@ -3530,10 +3680,10 @@ async function refreshSkills(opts = {}) {
           continue;
         let siblingPath;
         if (samplePath.endsWith("SKILL.md")) {
-          const parentDir = dirname(dirname(samplePath));
+          const parentDir = dirname2(dirname2(samplePath));
           siblingPath = `${parentDir}/${name}/SKILL.md`;
         } else {
-          const parentDir = dirname(samplePath);
+          const parentDir = dirname2(samplePath);
           siblingPath = `${parentDir}/${name}.md`;
         }
         if (existsSync4(siblingPath)) {
@@ -4327,7 +4477,7 @@ var TOOLS = {
     }
   },
   harmony_classify_card: {
-    description: "Classify a card with the LLM classifier: sets `intent` (plan/think/implement/review), `complexity_score` (0-10), `model_tier` (simple/advanced/research), stamps `classified_at`, and applies the type label (feature/bug/idea). Call right after creating a card to classify it in-flow. Idempotent; never touches the user-owned `model_override`.",
+    description: "DEPRECATED — run sizing now happens at daemon pickup and is run-scoped, so nothing reads `model_tier`, `intent` or `complexity_score` any more; this tool still writes them, but only the type label has an effect. Prefer letting card creation apply the type label. Sets `intent` (plan/think/implement/review), `complexity_score` (0-10), `model_tier` (simple/advanced/research), stamps `classified_at`, and applies the type label (feature/bug/idea). Idempotent; never touches the user-owned `model_override`.",
     inputSchema: {
       type: "object",
       properties: {
@@ -4581,11 +4731,15 @@ var TOOLS = {
     }
   },
   harmony_set_project_context: {
-    description: "Set the active project context for subsequent operations",
+    description: "Set the active project context for subsequent operations. The project's workspace is set with it, so the two can never point at different places; pass workspaceId to skip the lookup.",
     inputSchema: {
       type: "object",
       properties: {
-        projectId: { type: "string" }
+        projectId: { type: "string" },
+        workspaceId: {
+          type: "string",
+          description: "The workspace this project belongs to. Optional — looked up when omitted."
+        }
       },
       required: ["projectId"]
     }
@@ -5389,13 +5543,26 @@ var TOOLS = {
           type: "array",
           description: "The playbook's ordered stage objects.",
           items: { type: "object" }
+        },
+        triggerType: {
+          type: "string",
+          enum: ["manual", "auto"],
+          description: "'manual' (default) — the playbook is applied by a person. 'auto' — it claims matching cards itself, and requires autoBind."
+        },
+        autoBind: {
+          type: "object",
+          description: "Auto-bind rule: {priority?: number, mode?: 'all'|'any', when: [{path, op, value}]}. Conditions are evaluated against the card's labels (lowercased), intent, complexity_score and priority with the gate operators eq/neq/gte/gt/lte/lt/contains/exists; 'contains' on labels is membership. Stored even while triggerType is 'manual', so a rule can be armed later without re-authoring it."
+        },
+        catalogId: {
+          type: "string",
+          description: "Slug of the built-in template this came from (provenance only; never used to match)."
         }
       },
       required: ["name"]
     }
   },
   harmony_update_playbook: {
-    description: "Update a playbook's name, description, steps/stages, enabled flag, or lifecycle state ('active'|'deprecated').",
+    description: "Update a playbook's name, description, steps/stages, enabled flag, lifecycle state ('active'|'deprecated'), or its auto-bind rule and arming.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5418,6 +5585,15 @@ var TOOLS = {
           type: "string",
           enum: ["active", "deprecated"],
           description: "Lifecycle state"
+        },
+        triggerType: {
+          type: "string",
+          enum: ["manual", "auto"],
+          description: "Arm ('auto') or disarm ('manual') automatic application. Arming requires a rule to be present or supplied in the same call."
+        },
+        autoBind: {
+          type: "object",
+          description: "Replace the auto-bind rule: {priority?, mode?: 'all'|'any', when: [{path, op, value}]}. Pass null to remove it."
         }
       },
       required: ["playbookId"]
@@ -5882,7 +6058,10 @@ async function handleToolCall(name, args, deps) {
           const where = resolved.project.workspaceName ? `project "${resolved.project.name ?? resolved.project.id}" (workspace "${resolved.project.workspaceName}")` : `project "${resolved.project.name ?? resolved.project.id}"`;
           const established = activeProjectId == null;
           if (established) {
-            deps.setActiveProject(resolved.project.id);
+            deps.setActiveContext({
+              projectId: resolved.project.id,
+              workspaceId: resolved.project.workspaceId
+            });
           }
           return {
             success: true,
@@ -6321,15 +6500,57 @@ ${options}
     }
     case "harmony_set_project_context": {
       const projectId = z.string().uuid().parse(args.projectId);
-      deps.setActiveProject(projectId);
-      return { success: true, activeProjectId: projectId };
+      const explicitWorkspaceId = args.workspaceId ? z.string().uuid().parse(args.workspaceId) : null;
+      let owningWorkspaceId = explicitWorkspaceId;
+      if (!owningWorkspaceId) {
+        try {
+          const { workspaces } = await client3.listWorkspaces();
+          for (const workspace of workspaces) {
+            if (!workspace?.id)
+              continue;
+            const { projects } = await client3.listProjects(workspace.id);
+            if (projects.some((p) => p?.id === projectId)) {
+              owningWorkspaceId = workspace.id;
+              break;
+            }
+          }
+        } catch (error) {
+          const reason = error instanceof Error ? error.message : String(error);
+          return {
+            success: false,
+            activeProjectId: deps.getActiveProjectId(),
+            activeWorkspaceId: deps.getActiveWorkspaceId(),
+            note: `Could not resolve this project's workspace (${reason}), so the ` + `active context was left unchanged rather than half-written. ` + `Retry, or pass workspaceId explicitly to skip the lookup.`
+          };
+        }
+        if (!owningWorkspaceId) {
+          return {
+            success: false,
+            activeProjectId: deps.getActiveProjectId(),
+            activeWorkspaceId: deps.getActiveWorkspaceId(),
+            note: `Project ${projectId} is not in any workspace this connection ` + `can reach, so the active context was left unchanged. Check ` + `harmony_list_projects, pass workspaceId explicitly, or ` + `reconnect with /mcp if it lives in another workspace.`
+          };
+        }
+      }
+      deps.setActiveContext({ projectId, workspaceId: owningWorkspaceId });
+      return {
+        success: true,
+        activeProjectId: projectId,
+        activeWorkspaceId: owningWorkspaceId
+      };
     }
     case "harmony_get_context": {
+      const report = describeActiveContext({
+        projectId: deps.getActiveProjectId(),
+        workspaceId: deps.getActiveWorkspaceId()
+      });
       return {
         success: true,
         context: {
-          activeWorkspaceId: deps.getActiveWorkspaceId(),
-          activeProjectId: deps.getActiveProjectId()
+          activeWorkspaceId: report.workspaceId,
+          activeProjectId: report.projectId,
+          consistent: report.consistent,
+          ...report.note ? { note: report.note } : {}
         }
       };
     }
@@ -6769,7 +6990,7 @@ ${options}
       if (trimmed.length > 0) {
         const touchIds = trimmed.map(({ entity }) => entity?.id).filter((id) => typeof id === "string");
         if (touchIds.length > 0) {
-          client3.batchTouchMemoryEntities(touchIds).catch(() => {});
+          client3.batchTouchMemoryEntities(touchIds, "mcp-tool").catch(() => {});
         }
       }
       let sessionEntities = [];
@@ -7178,9 +7399,17 @@ ${options}
         workspaceId,
         name: name2,
         description: args.description,
-        steps: args.steps
+        steps: args.steps,
+        triggerType: args.triggerType,
+        autoBind: args.autoBind,
+        catalogId: args.catalogId
       });
-      return { success: true, playbook: result.playbook };
+      const warnings = await collectPlaybookMetricWarnings(client3, workspaceId, args.steps);
+      return {
+        success: true,
+        playbook: result.playbook,
+        ...warnings.length > 0 ? { warnings } : {}
+      };
     }
     case "harmony_update_playbook": {
       const playbookId = z.string().uuid().parse(args.playbookId);
@@ -7189,9 +7418,16 @@ ${options}
         description: args.description,
         steps: args.steps,
         enabled: args.enabled,
-        state: args.state
+        state: args.state,
+        triggerType: args.triggerType,
+        ..."autoBind" in args ? { autoBind: args.autoBind } : {}
       });
-      return { success: true, playbook: result.playbook };
+      const warnings = await collectPlaybookMetricWarnings(client3, result.playbook?.workspace_id, args.steps);
+      return {
+        success: true,
+        playbook: result.playbook,
+        ...warnings.length > 0 ? { warnings } : {}
+      };
     }
     case "harmony_save_card_as_playbook":
       return deprecatedRemovedToolResult("harmony_save_card_as_playbook");
@@ -7266,8 +7502,10 @@ ${options}
         apiUrl: deps.getApiUrl()
       });
       deps.saveConfig({ apiKey: result.apiKey.rawKey });
-      deps.setActiveWorkspace(result.workspace.id);
-      deps.setActiveProject(result.project.id);
+      deps.setActiveContext({
+        projectId: result.project.id,
+        workspaceId: result.workspace.id
+      });
       deps.resetClient();
       return {
         success: true,
@@ -7289,7 +7527,7 @@ function createConfigDeps() {
     isConfigured,
     getActiveProjectId: () => getActiveProjectId(),
     getActiveWorkspaceId: () => getActiveWorkspaceId(),
-    setActiveProject: (id) => setActiveProject(id),
+    setActiveContext: (context) => setActiveContext(context),
     setActiveWorkspace: (id) => setActiveWorkspace(id),
     getApiUrl,
     getMemoryDir: () => getMemoryDir(),