@memoraone/mcp 0.1.21 → 0.1.23

package/dist/daemon.cjs

@@ -41,7 +41,28 @@ var os = __toESM(require("os"), 1);
 var path = __toESM(require("path"), 1);
 var fs = __toESM(require("fs"), 1);
 var BASE_DIR = process.env.MEMORAONE_MCP_LOCK_DIR || path.join(os.homedir(), ".memoraone-mcp");
-function getSocketPath(projectId) {
+var IDE_TYPES = ["cursor", "copilot-vscode", "jetbrains"];
+var IDE_TYPE_SET = new Set(IDE_TYPES);
+function parseIdeType(value) {
+  if (value === void 0 || value.trim() === "" || !IDE_TYPE_SET.has(value)) {
+    return void 0;
+  }
+  return value;
+}
+function resolveIdeTypeFromEnv(env2 = process.env) {
+  return parseIdeType(env2.MEMORAONE_IDE_TYPE);
+}
+function parseIdeTypeFromArgv(args) {
+  const idx = args.indexOf("--ide");
+  if (idx === -1 || idx + 1 >= args.length) {
+    return void 0;
+  }
+  return parseIdeType(args[idx + 1]);
+}
+function getSocketPath(projectId, ideType) {
+  if (ideType) {
+    return path.join(BASE_DIR, `mcp-${projectId}-${ideType}.sock`);
+  }
   return path.join(BASE_DIR, `mcp-${projectId}.sock`);
 }
 function ensureBaseDir() {
@@ -53,6 +74,13 @@ function ensureBaseDir() {
 var fs2 = __toESM(require("fs/promises"), 1);
 var path2 = __toESM(require("path"), 1);
 var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function normalizeEnvironment(raw) {
+  if (raw === void 0 || raw === null || typeof raw !== "string") {
+    return void 0;
+  }
+  const trimmed = raw.trim();
+  return trimmed === "" ? void 0 : trimmed;
+}
 function parseAndValidateM1(content, markerPath) {
   let parsed2;
   try {
@@ -69,7 +97,8 @@ function parseAndValidateM1(content, markerPath) {
   }
   const apiKeyRaw = parsed2?.MEMORAONE_API_KEY ?? parsed2?.api_key;
   const apiKey = apiKeyRaw !== void 0 && apiKeyRaw !== null && typeof apiKeyRaw === "string" && apiKeyRaw.trim() !== "" ? apiKeyRaw.trim() : null;
-  return { projectId: projectId.trim(), apiKey };
+  const environment = normalizeEnvironment(parsed2?.environment);
+  return environment === void 0 ? { projectId: projectId.trim(), apiKey } : { projectId: projectId.trim(), apiKey, environment };
 }
 async function resolveProjectIdFromExplicitM1Path() {
   const raw = process.env.MEMORAONE_M1_PATH;
@@ -79,8 +108,8 @@ async function resolveProjectIdFromExplicitM1Path() {
   const markerPath = path2.resolve(raw);
   try {
     const content = await fs2.readFile(markerPath, "utf8");
-    const { projectId, apiKey } = parseAndValidateM1(content, markerPath);
-    return { projectId, apiKey, foundAt: markerPath };
+    const { projectId, apiKey, environment } = parseAndValidateM1(content, markerPath);
+    return environment === void 0 ? { projectId, apiKey, foundAt: markerPath } : { projectId, apiKey, environment, foundAt: markerPath };
   } catch (err) {
     if (err?.code === "ENOENT") {
       return null;
@@ -94,9 +123,9 @@ async function findM1WalkingUp(workspaceRoot) {
     const markerPath = path2.join(current, "memoraone.m1");
     try {
       const content = await fs2.readFile(markerPath, "utf8");
-      const { projectId, apiKey } = parseAndValidateM1(content, markerPath);
+      const { projectId, apiKey, environment } = parseAndValidateM1(content, markerPath);
       const repoRoot = path2.dirname(markerPath);
-      return { projectId, apiKey, repoRoot, markerPath };
+      return environment === void 0 ? { projectId, apiKey, repoRoot, markerPath } : { projectId, apiKey, environment, repoRoot, markerPath };
     } catch (err) {
       if (err?.code !== "ENOENT") {
         throw err;
@@ -156,6 +185,7 @@ async function resolveAuthoritativeBinding(workspaceRoot) {
       workspaceRoot: path2.dirname(explicitBinding.foundAt),
       m1Path: explicitBinding.foundAt,
       apiKey: resolved.apiKey,
+      ...explicitBinding.environment !== void 0 ? { environment: explicitBinding.environment } : {},
       bindingSource: "explicit-m1-path",
       apiKeySource: resolved.apiKeySource
     };
@@ -173,6 +203,7 @@ async function resolveAuthoritativeBinding(workspaceRoot) {
         workspaceRoot: binding.repoRoot,
         m1Path: binding.markerPath,
         apiKey: resolved.apiKey,
+        ...binding.environment !== void 0 ? { environment: binding.environment } : {},
         bindingSource: "workspace-search",
         apiKeySource: resolved.apiKeySource
       };
@@ -194,6 +225,7 @@ function decodeResolvedBinding(value) {
   const workspaceRoot = parsed2?.workspaceRoot;
   const m1Path = parsed2?.m1Path;
   const apiKey = parsed2?.apiKey;
+  const environment = normalizeEnvironment(parsed2?.environment);
   const bindingSource = parsed2?.bindingSource;
   const apiKeySource = parsed2?.apiKeySource;
   if (!projectId || typeof projectId !== "string" || !uuidRegex.test(projectId.trim())) {
@@ -219,6 +251,7 @@ function decodeResolvedBinding(value) {
     workspaceRoot,
     m1Path,
     apiKey: typeof apiKey === "string" && apiKey.trim() !== "" ? apiKey.trim() : null,
+    ...environment !== void 0 ? { environment } : {},
     bindingSource,
     apiKeySource
   };
@@ -226,7 +259,6 @@ function decodeResolvedBinding(value) {
 
 // src/index.ts
 var path7 = __toESM(require("path"), 1);
-var crypto5 = __toESM(require("crypto"), 1);
 var import_node_url2 = require("url");
 var import_mcp = require("@modelcontextprotocol/sdk/server/mcp.js");
 var import_types = require("@modelcontextprotocol/sdk/types.js");
@@ -541,6 +573,7 @@ async function registerRepoSource(client, projectId, repoPath, ideType) {
 
 // src/tools/postEvent.ts
 var import_v42 = require("zod/v4");
+var postEventDescription = 'Append a durable project-change note to the MemoraOne timeline. Use after meaningful repository or project changes: decisions, fixes, new endpoints, schema changes, migrations, important wiring, or durable product behavior changes \u2014 not for trivial edits, formatting-only changes, or temporary WIP. Recommended shape: kind "note"; content.title (concise title); content.body (one durable, fact-promotable project-change statement); metadata.source (agent name, e.g. "cursor"); metadata.purpose "dev-log"; metadata.schema "v1".';
 var postEventShape = {
   kind: import_v42.z.string().min(1),
   actor: import_v42.z.object({
@@ -649,6 +682,9 @@ var setProjectShape = {
   projectId: import_v411.z.string().min(1).optional()
 };
 
+// src/tools/bindingStatus.ts
+var bindingStatusShape = {};
+
 // src/tools/handlers/postEvent.ts
 var import_v412 = require("zod/v4");
 var crypto3 = __toESM(require("crypto"), 1);
@@ -721,6 +757,32 @@ var postEventInputSchema = import_v412.z.object({
   content: import_v412.z.record(import_v412.z.string(), import_v412.z.any()),
   metadata: import_v412.z.record(import_v412.z.string(), import_v412.z.any()).optional()
 });
+function buildPostEventContentFields(content) {
+  if (typeof content.message === "string") {
+    return { message: content.message };
+  }
+  if (typeof content.text === "string") {
+    return { message: content.text };
+  }
+  const title = typeof content.title === "string" ? content.title : void 0;
+  const body = typeof content.body === "string" ? content.body : void 0;
+  if (title !== void 0 || body !== void 0) {
+    const message = body ?? title ?? "";
+    const structuredContent = {};
+    for (const [key, value] of Object.entries(content)) {
+      if (key === "message" || key === "text") continue;
+      structuredContent[key] = value;
+    }
+    const new_value = {
+      message,
+      ...title !== void 0 ? { title } : {},
+      ...body !== void 0 ? { body } : {},
+      content: structuredContent
+    };
+    return { message, new_value };
+  }
+  return { message: JSON.stringify(content) };
+}
 async function handlePostEvent(client, args) {
   const nonce = crypto3.randomBytes(8).toString("hex");
   console.error(
@@ -732,7 +794,7 @@ async function handlePostEvent(client, args) {
     throw new Error("No project selected. Use memora_list_projects and memora_set_project to select a project.");
   }
   const content = parsed2.content ?? {};
-  const message = typeof content.message === "string" ? content.message : typeof content.text === "string" ? content.text : JSON.stringify(content);
+  const { message, new_value } = buildPostEventContentFields(content);
   const body = {
     kind: parsed2.kind,
     message,
@@ -742,6 +804,7 @@ async function handlePostEvent(client, args) {
       identifier: config2.agentName,
       ...parsed2.actor.id ? { id: parsed2.actor.id } : {}
     },
+    ...new_value ? { new_value } : {},
     ...parsed2.metadata ? { metadata: parsed2.metadata } : {}
   };
   try {
@@ -926,7 +989,8 @@ async function handleAskWithMemory(client, args) {
   }
   return {
     answer: res.answer,
-    used: res.used ?? {}
+    used: res.used ?? {},
+    ...res.retrieval !== void 0 ? { retrieval: res.retrieval } : {}
   };
 }
 
@@ -1471,47 +1535,144 @@ async function handleSetProject(args) {
   return { ok: true, projectKey: resolvedProjectKey };
 }
 
-// src/index.ts
-var notInitializedResult = {
-  content: [
-    {
-      type: "text",
-      text: "MemoraOne MCP not initialized (project binding missing)."
-    }
-  ]
-};
-var initializeDiagDumped = false;
-var uriToPath = (uri) => {
-  if (uri.startsWith("file://")) {
-    return (0, import_node_url2.fileURLToPath)(uri);
+// src/tools/handlers/bindingStatus.ts
+function buildBindingStatus(binding) {
+  const status = {
+    projectId: binding.projectId,
+    workspaceRoot: binding.workspaceRoot,
+    m1Path: binding.m1Path,
+    bindingSource: binding.bindingSource,
+    apiKeySource: binding.apiKeySource
+  };
+  if (binding.environment !== void 0) {
+    status.environment = binding.environment;
   }
-  return uri;
-};
-function getCursorWorkspaceRootFromEnv() {
-  const raw = process.env.WORKSPACE_FOLDER_PATHS;
-  if (raw === void 0 || raw.trim() === "") {
-    return void 0;
+  return status;
+}
+function handleBindingStatus(binding) {
+  if (!binding) {
+    throw new Error("[memoraone-mcp] Binding status unavailable (not initialized)");
   }
-  const parts = raw.split(path7.delimiter).map((p) => p.trim()).filter(Boolean);
-  const first = parts[0];
-  return first ? path7.resolve(first) : void 0;
+  return buildBindingStatus(binding);
+}
+
+// src/heartbeat.ts
+var crypto5 = __toESM(require("crypto"), 1);
+function fingerprintApiKey(apiKey) {
+  return crypto5.createHash("sha256").update(apiKey).digest("hex").slice(0, 12);
 }
 function isHeartbeatDebugEnabled() {
   const value = String(process.env.MEMORAONE_DEBUG_HEARTBEAT ?? "").trim().toLowerCase();
   return ["1", "true", "yes", "on"].includes(value);
 }
-function fingerprintApiKey(apiKey) {
-  return crypto5.createHash("sha256").update(apiKey).digest("hex").slice(0, 12);
+function resolveHeartbeatIntervalMs() {
+  return Number.isFinite(config2.heartbeatIntervalMs) ? Math.max(1e3, config2.heartbeatIntervalMs) : 3e4;
+}
+function isDaemonIdleShutdownAllowed() {
+  return !config2.heartbeatEnabled;
 }
-function inferIdeType(params) {
-  if (config2.ideType) {
-    return config2.ideType;
+async function sendProjectHeartbeat(client, ctx) {
+  try {
+    const pid = ctx.projectId?.trim();
+    if (isHeartbeatDebugEnabled()) {
+      process.stderr.write(
+        `[memoraone-mcp][diag] heartbeat projectId=${pid ?? "unknown"} apiKeySource=${ctx.apiKeySource ?? "unknown"} apiKeyFingerprint=${ctx.apiKeyFingerprint ?? "unknown"} ideType=${ctx.ideType ?? "unknown"}
+`
+      );
+    }
+    if (!pid) {
+      throw new Error("[memoraone-mcp] Cannot send heartbeat without an active project binding");
+    }
+    const body = {};
+    if (ctx.ideType) body.ide_type = ctx.ideType;
+    await client.post(`/v1/projects/${pid}/heartbeat`, body, {
+      log: false,
+      headers: {
+        "x-project-id": pid
+      }
+    });
+  } catch (err) {
+    process.stderr.write(
+      `[memoraone-mcp][info] heartbeat error (silent) ${String(err)}
+`
+    );
+  }
+}
+function createDaemonHeartbeat(opts) {
+  let interval = null;
+  let client = null;
+  const ctx = {
+    projectId: opts.binding.projectId,
+    ideType: opts.ideType,
+    apiKeySource: opts.binding.apiKeySource,
+    apiKeyFingerprint: opts.binding.apiKey ? fingerprintApiKey(opts.binding.apiKey) : null
+  };
+  const log2 = opts.onLog ?? ((msg) => {
+    process.stderr.write(`[memoraone-mcp][daemon-heartbeat] ${msg}
+`);
+  });
+  const start = async () => {
+    if (!config2.heartbeatEnabled) {
+      log2("disabled by config");
+      return;
+    }
+    if (interval) {
+      log2("already running (skipped duplicate start)");
+      return;
+    }
+    const apiKey = opts.binding.apiKey;
+    if (!apiKey) {
+      log2("cannot start: no api key in binding");
+      return;
+    }
+    const projectId = opts.binding.projectId;
+    client = new memoraClient_default(config2, projectId, apiKey);
+    const intervalMs = resolveHeartbeatIntervalMs();
+    log2(
+      `daemon owns heartbeat for project=${projectId} ideType=${ctx.ideType ?? "unknown"} interval=${intervalMs}ms`
+    );
+    void sendProjectHeartbeat(client, ctx);
+    interval = setInterval(() => {
+      if (!client) return;
+      sendProjectHeartbeat(client, ctx).catch(() => {
+      });
+    }, intervalMs);
+  };
+  const stop = () => {
+    if (interval) {
+      clearInterval(interval);
+      interval = null;
+    }
+    client = null;
+    log2(`daemon released heartbeat for project=${opts.binding.projectId}`);
+  };
+  const isRunning = () => interval !== null;
+  const setIdeType = (ideType) => {
+    if (ctx.ideType === ideType) {
+      return;
+    }
+    ctx.ideType = ideType;
+    log2(`daemon heartbeat ideType updated to ${ideType}`);
+    if (client) {
+      void sendProjectHeartbeat(client, ctx);
+    }
+  };
+  const getIdeType = () => ctx.ideType;
+  return { start, stop, isRunning, setIdeType, getIdeType };
+}
+
+// src/ideType.ts
+function inferIdeType(params, options = {}) {
+  const env2 = options.env ?? process.env;
+  const argv = (options.argv ?? process.argv).join(" ").toLowerCase();
+  const configIdeType = options.configIdeType ?? config2.ideType;
+  if (configIdeType) {
+    return configIdeType;
   }
   const clientInfoName = String(params?.clientInfo?.name ?? "").toLowerCase();
   const clientInfoVersion = String(params?.clientInfo?.version ?? "").toLowerCase();
-  const termProgram = String(process.env.TERM_PROGRAM ?? "").toLowerCase();
-  const argv = process.argv.join(" ").toLowerCase();
-  const envKeys = Object.keys(process.env);
+  const termProgram = String(env2.TERM_PROGRAM ?? "").toLowerCase();
+  const envKeys = Object.keys(env2);
   const hasCursorSignals = envKeys.some((key) => key.startsWith("CURSOR_")) || termProgram === "cursor" || clientInfoName.includes("cursor") || clientInfoVersion.includes("cursor") || argv.includes("cursor");
   if (hasCursorSignals) {
     return "cursor";
@@ -1523,7 +1684,7 @@ function inferIdeType(params) {
       "JETBRAINS_REMOTE_RUN",
       "INTELLIJ_ENVIRONMENT_READER"
     ].includes(key)
-  ) || String(process.env.TERMINAL_EMULATOR ?? "").toLowerCase().includes("jetbrains") || /(jetbrains|intellij|pycharm|webstorm|goland|rubymine|clion|phpstorm|rider|datagrip)/.test(
+  ) || String(env2.TERMINAL_EMULATOR ?? "").toLowerCase().includes("jetbrains") || /(jetbrains|intellij|pycharm|webstorm|goland|rubymine|clion|phpstorm|rider|datagrip)/.test(
     clientInfoName
   ) || /(jetbrains|intellij|pycharm|webstorm|goland|rubymine|clion|phpstorm|rider|datagrip)/.test(
     argv
@@ -1537,32 +1698,31 @@ function inferIdeType(params) {
   }
   return void 0;
 }
-async function sendHeartbeat(client, runtime) {
-  try {
-    const pid = runtime.projectId?.trim();
-    if (isHeartbeatDebugEnabled()) {
-      process.stderr.write(
-        `[memoraone-mcp][diag] heartbeat projectId=${pid ?? "unknown"} apiKeySource=${runtime.apiKeySource ?? "unknown"} apiKeyFingerprint=${runtime.apiKeyFingerprint ?? "unknown"}
-`
-      );
-    }
-    if (!pid) {
-      throw new Error("[memoraone-mcp] Cannot send heartbeat without an active project binding");
+
+// src/index.ts
+var notInitializedResult = {
+  content: [
+    {
+      type: "text",
+      text: "MemoraOne MCP not initialized (project binding missing)."
     }
-    const body = {};
-    if (runtime.ideType) body.ide_type = runtime.ideType;
-    await client.post(`/v1/projects/${pid}/heartbeat`, body, {
-      log: false,
-      headers: {
-        "x-project-id": pid
-      }
-    });
-  } catch (err) {
-    process.stderr.write(
-      `[memoraone-mcp][info] heartbeat error (silent) ${String(err)}
-`
-    );
+  ]
+};
+var initializeDiagDumped = false;
+var uriToPath = (uri) => {
+  if (uri.startsWith("file://")) {
+    return (0, import_node_url2.fileURLToPath)(uri);
+  }
+  return uri;
+};
+function getCursorWorkspaceRootFromEnv() {
+  const raw = process.env.WORKSPACE_FOLDER_PATHS;
+  if (raw === void 0 || raw.trim() === "") {
+    return void 0;
   }
+  const parts = raw.split(path7.delimiter).map((p) => p.trim()).filter(Boolean);
+  const first = parts[0];
+  return first ? path7.resolve(first) : void 0;
 }
 function redactSensitiveFields(obj) {
   if (obj === null || obj === void 0) return obj;
@@ -1654,6 +1814,7 @@ async function main(opts = {}) {
     projectId: null,
     apiKeySource: null,
     apiKeyFingerprint: null,
+    authoritativeBinding: opts.authoritativeBinding ?? null,
     ideType: void 0
   };
   let workspaceRoot;
@@ -1703,7 +1864,7 @@ async function main(opts = {}) {
   const registeredToolNames = [];
   server.tool(
     "memora_post_event",
-    "Forward an event to MemoraOne timeline",
+    postEventDescription,
     postEventShape,
     async (args) => runWithSessionContext(sessionContext, async () => {
       if (!runtime.client || !runtime.projectId) return notInitializedResult;
@@ -1779,6 +1940,19 @@ async function main(opts = {}) {
     })
   );
   registeredToolNames.push("memora_set_project");
+  server.tool(
+    "memora_status",
+    "Return non-secret project binding metadata for this MCP session",
+    bindingStatusShape,
+    async () => runWithSessionContext(sessionContext, async () => {
+      if (!runtime.authoritativeBinding) return notInitializedResult;
+      const result = handleBindingStatus(runtime.authoritativeBinding);
+      return {
+        content: [{ type: "text", text: JSON.stringify(result) }]
+      };
+    })
+  );
+  registeredToolNames.push("memora_status");
   registerToolWithWorklog(
     server,
     runtime,
@@ -1860,6 +2034,9 @@ async function main(opts = {}) {
       try {
         const params = request.params;
         runtime.ideType = inferIdeType(params);
+        if (runtime.ideType && opts.onSessionIdeTypeKnown) {
+          opts.onSessionIdeTypeKnown(runtime.ideType);
+        }
         if (!initializeDiagDumped) {
           initializeDiagDumped = true;
           const folders = Array.isArray(params.workspaceFolders) ? params.workspaceFolders.map((f) => ({ name: f?.name, uri: f?.uri })) : params.workspaceFolders;
@@ -1929,10 +2106,12 @@ async function main(opts = {}) {
         runtime.projectId = projectId;
         runtime.apiKeySource = binding.apiKeySource;
         runtime.apiKeyFingerprint = fingerprintApiKey(apiKeyToUse);
+        runtime.authoritativeBinding = binding;
         runtime.client = new memoraClient_default(config2, projectId, apiKeyToUse);
         workspaceRoot = binding.workspaceRoot;
+        const environmentLog = binding.environment !== void 0 ? ` environment=${binding.environment}` : "";
         process.stderr.write(
-          `[memoraone-mcp] registering workspace source bindingSource=${binding.bindingSource} workspaceRoot=${workspaceRoot ?? "(unset)"} m1Path=${binding.m1Path}
+          `[memoraone-mcp] registering workspace source bindingSource=${binding.bindingSource} workspaceRoot=${workspaceRoot ?? "(unset)"} m1Path=${binding.m1Path}${environmentLog}
 `
         );
         await registerRepoSource(
@@ -1946,8 +2125,9 @@ async function main(opts = {}) {
           console.error("[memoraone-mcp][auth] project_id:", projectId);
           console.error("[memoraone-mcp][auth] api_key source:", binding.apiKeySource);
         }
+        const bindingEnvironmentLog = binding.environment !== void 0 ? ` environment=${binding.environment}` : "";
         console.error(
-          `[memoraone-mcp] ${sessionLabel} authoritative binding: project=${binding.projectId} workspace=${binding.workspaceRoot} m1=${binding.m1Path} source=${binding.bindingSource} apiKeySource=${binding.apiKeySource}`
+          `[memoraone-mcp] ${sessionLabel} authoritative binding: project=${binding.projectId} workspace=${binding.workspaceRoot} m1=${binding.m1Path} source=${binding.bindingSource} apiKeySource=${binding.apiKeySource}${bindingEnvironmentLog}`
         );
         bindingReadyResolve?.(runtime.client);
         return server.server._oninitialize(request);
@@ -1964,14 +2144,25 @@ async function main(opts = {}) {
   await server.connect(transport);
   const activeClient = await bindingReady;
   let heartbeatInterval = null;
-  if (config2.heartbeatEnabled) {
-    await sendHeartbeat(activeClient, runtime);
-    const intervalMs = Number.isFinite(config2.heartbeatIntervalMs) ? Math.max(1e3, config2.heartbeatIntervalMs) : 3e4;
+  const daemonSession = Boolean(opts.sessionSocket);
+  if (config2.heartbeatEnabled && daemonSession) {
+    console.error(
+      `[memoraone-mcp] ${sessionLabel} defers heartbeat to daemon for project ${runtime.projectId}`
+    );
+  } else if (config2.heartbeatEnabled) {
+    const intervalMs = resolveHeartbeatIntervalMs();
+    const heartbeatCtx = {
+      projectId: runtime.projectId,
+      ideType: runtime.ideType,
+      apiKeySource: runtime.apiKeySource,
+      apiKeyFingerprint: runtime.apiKeyFingerprint
+    };
     console.error(
       `[memoraone-mcp] ${sessionLabel} owns heartbeat for project ${runtime.projectId} interval=${intervalMs}ms`
     );
+    await sendProjectHeartbeat(activeClient, heartbeatCtx);
     heartbeatInterval = setInterval(() => {
-      sendHeartbeat(activeClient, runtime).catch(() => {
+      sendProjectHeartbeat(activeClient, heartbeatCtx).catch(() => {
       });
     }, intervalMs);
   }
@@ -1980,10 +2171,14 @@ async function main(opts = {}) {
   const shutdown = (signal, exitProcess = true) => {
     process.off("SIGINT", onSigInt);
     process.off("SIGTERM", onSigTerm);
-    if (heartbeatInterval) clearInterval(heartbeatInterval);
-    heartbeatInterval = null;
-    if (runtime.projectId) {
-      console.error(`[memoraone-mcp] ${sessionLabel} released heartbeat for project ${runtime.projectId}`);
+    if (heartbeatInterval) {
+      clearInterval(heartbeatInterval);
+      heartbeatInterval = null;
+      if (runtime.projectId) {
+        console.error(
+          `[memoraone-mcp] ${sessionLabel} released session heartbeat for project ${runtime.projectId}`
+        );
+      }
     }
     if (devMode) {
       console.error(`[memoraone-mcp] ${sessionLabel} received ${signal}, shutting down`);
@@ -2059,7 +2254,8 @@ async function ensureSocketClean(socketPath) {
 async function runDaemon() {
   const projectId = parseProjectIdFromArgv();
   const binding = parseBindingFromEnv(projectId);
-  const socketPath = getSocketPath(projectId);
+  const ideType = parseIdeTypeFromArgv(process.argv.slice(2)) ?? config2.ideType ?? resolveIdeTypeFromEnv();
+  const socketPath = getSocketPath(projectId, ideType);
   let nextSessionId = 1;
   let activeSessions = 0;
   let idleTimer = null;
@@ -2070,6 +2266,14 @@ async function runDaemon() {
     `authoritative binding project=${binding.projectId} workspace=${binding.workspaceRoot} m1=${binding.m1Path} source=${binding.bindingSource} apiKeySource=${binding.apiKeySource}`
   );
   log("session policy: concurrent bridge sessions allowed per project daemon");
+  if (!isDaemonIdleShutdownAllowed()) {
+    log("idle shutdown disabled while daemon heartbeat is active");
+  }
+  const daemonHeartbeat = createDaemonHeartbeat({
+    binding,
+    ideType,
+    onLog: (msg) => log(msg)
+  });
   await ensureSocketClean(socketPath);
   const cleanupSocketFile = () => {
     try {
@@ -2096,6 +2300,10 @@ async function runDaemon() {
       activeSessions = Math.max(0, activeSessions - 1);
       log(`session=${sessionId} closed activeSessions=${activeSessions}`);
       if (activeSessions === 0 && !shuttingDown) {
+        if (!isDaemonIdleShutdownAllowed()) {
+          log("idle shutdown skipped (daemon heartbeat active)");
+          return;
+        }
         idleTimer = setTimeout(() => {
           if (activeSessions !== 0 || shuttingDown) return;
           shuttingDown = true;
@@ -2118,7 +2326,10 @@ async function runDaemon() {
         authoritativeBinding: binding,
         transport,
         sessionSocket: socket,
-        sessionLabel: `daemon-session-${sessionId}`
+        sessionLabel: `daemon-session-${sessionId}`,
+        onSessionIdeTypeKnown: (ideType2) => {
+          daemonHeartbeat.setIdeType(ideType2);
+        }
       });
     } catch (err) {
       log(`session error: ${String(err)}`);
@@ -2139,6 +2350,9 @@ async function runDaemon() {
       clearTimeout(idleTimer);
       idleTimer = null;
     }
+    if (daemonHeartbeat.isRunning()) {
+      daemonHeartbeat.stop();
+    }
     log(`daemon shutdown: ${reason}`);
     server.close(() => {
       cleanupSocketFile();
@@ -2151,6 +2365,9 @@ async function runDaemon() {
   return new Promise((resolve6) => {
     server.listen(socketPath, () => {
       log(`daemon started, listening on ${socketPath}`);
+      void daemonHeartbeat.start().catch((err) => {
+        log(`daemon heartbeat start error: ${String(err)}`);
+      });
       resolve6();
     });
   });