coding-friend-cli 1.27.1 → 1.28.0

package/dist/index.js

@@ -14,7 +14,7 @@ program.name("cf").description(
   "coding-friend CLI \u2014 host learning docs, setup MCP, init projects"
 ).version(pkg.version, "-v, --version");
 program.command("install").description("Install the Coding Friend plugin into Claude Code").option("--user", "Install at user scope (all projects)").option("--global", "Install at user scope (all projects)").option("--project", "Install at project scope (shared via git)").option("--local", "Install at local scope (this machine only)").action(async (opts) => {
-  const { installCommand } = await import("./install-G4XYNVL3.js");
+  const { installCommand } = await import("./install-XZC6UO54.js");
   await installCommand(opts);
 });
 program.command("uninstall").description("Uninstall the Coding Friend plugin from Claude Code").option("--user", "Uninstall from user scope (all projects)").option("--global", "Uninstall from user scope (all projects)").option("--project", "Uninstall from project scope").option("--local", "Uninstall from local scope").action(async (opts) => {
@@ -30,19 +30,19 @@ program.command("enable").description("Re-enable the Coding Friend plugin").opti
   await enableCommand(opts);
 });
 program.command("init").description("Initialize coding-friend in current project").action(async () => {
-  const { initCommand } = await import("./init-KX6Y3ELD.js");
+  const { initCommand } = await import("./init-R5L2GAFV.js");
   await initCommand();
 });
 program.command("config").description("Manage Coding Friend configuration").action(async () => {
-  const { configCommand } = await import("./config-N55LTJ76.js");
+  const { configCommand } = await import("./config-U2WEZXF6.js");
   await configCommand();
 });
 program.command("host").description("Build and serve learning docs as a static website").argument("[path]", "path to docs folder").option("-p, --port <port>", "port number", "3333").action(async (path, opts) => {
-  const { hostCommand } = await import("./host-JVLWYY5A.js");
+  const { hostCommand } = await import("./host-2KBOPER6.js");
   await hostCommand(path, opts);
 });
 program.command("mcp").description("Setup MCP server for learning docs").argument("[path]", "path to docs folder").action(async (path) => {
-  const { mcpCommand } = await import("./mcp-DABSO5PE.js");
+  const { mcpCommand } = await import("./mcp-CNZLJ57B.js");
   await mcpCommand(path);
 });
 program.command("permission").description("Manage Claude Code permission rules for Coding Friend").option("--all", "Apply all recommended permissions without prompts").option("--user", "Save to user-level settings (~/.claude/settings.json)").option(
@@ -53,15 +53,15 @@ program.command("permission").description("Manage Claude Code permission rules f
   await permissionCommand(opts);
 });
 program.command("statusline").description("Setup coding-friend statusline in Claude Code").action(async () => {
-  const { statuslineCommand } = await import("./statusline-CDGADB3C.js");
+  const { statuslineCommand } = await import("./statusline-RMTO4MQA.js");
   await statuslineCommand();
 });
 program.command("update").description("Update coding-friend plugin, CLI, and statusline").option("--cli", "Update only the CLI (npm package)").option("--plugin", "Update only the Claude Code plugin").option("--statusline", "Update only the statusline").option("--user", "Update plugin at user scope (all projects)").option("--global", "Update plugin at user scope (all projects)").option("--project", "Update plugin at project scope").option("--local", "Update plugin at local scope").action(async (opts) => {
-  const { updateCommand } = await import("./update-6M3YFHS6.js");
+  const { updateCommand } = await import("./update-HS6A2C5V.js");
   await updateCommand(opts);
 });
 program.command("status").description("Show comprehensive Coding Friend status").action(async () => {
-  const { statusCommand } = await import("./status-K7TBUAXT.js");
+  const { statusCommand } = await import("./status-JXUXVHRH.js");
   await statusCommand();
 });
 var session = program.command("session").description("Save and load Claude Code sessions across machines");
@@ -76,11 +76,11 @@ session.command("save").description("Save current Claude Code session to sync fo
   "-s, --session-id <id>",
   "session UUID to save (default: auto-detect newest)"
 ).option("-l, --label <label>", "label for this session").action(async (opts) => {
-  const { sessionSaveCommand } = await import("./session-DMQZXZ7F.js");
+  const { sessionSaveCommand } = await import("./session-ZGNQKV4M.js");
   await sessionSaveCommand(opts);
 });
 session.command("load").description("Load a saved session from sync folder").action(async () => {
-  const { sessionLoadCommand } = await import("./session-DMQZXZ7F.js");
+  const { sessionLoadCommand } = await import("./session-ZGNQKV4M.js");
   await sessionLoadCommand();
 });
 var memory = program.command("memory").description("AI memory system \u2014 store and search project knowledge");
@@ -100,43 +100,43 @@ Memory subcommands:
   memory mcp          Show MCP server setup instructions`
 );
 memory.command("status").description("Show memory system status").action(async () => {
-  const { memoryStatusCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryStatusCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryStatusCommand();
 });
 memory.command("search").description("Search memories by query").argument("<query>", "search query").action(async (query) => {
-  const { memorySearchCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memorySearchCommand } = await import("./memory-KU2MOCPQ.js");
   await memorySearchCommand(query);
 });
 memory.command("list").description(
   "List memories in current project, or all projects with --projects"
 ).option("--projects", "List all project databases with size and metadata").action(async (opts) => {
-  const { memoryListCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryListCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryListCommand(opts);
 });
 memory.command("init").description(
   "Initialize memory system \u2014 interactive wizard (first time) or config menu"
 ).action(async () => {
-  const { memoryInitCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryInitCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryInitCommand();
 });
 memory.command("config").description("Configure memory system settings").action(async () => {
-  const { memoryConfigCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryConfigCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryConfigCommand();
 });
 memory.command("start-daemon").description("Start the memory daemon (Tier 2 \u2014 MiniSearch)").action(async () => {
-  const { memoryStartDaemonCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryStartDaemonCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryStartDaemonCommand();
 });
 memory.command("stop-daemon").description("Stop the memory daemon").action(async () => {
-  const { memoryStopDaemonCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryStopDaemonCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryStopDaemonCommand();
 });
 memory.command("rebuild").description("Rebuild the daemon search index").action(async () => {
-  const { memoryRebuildCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryRebuildCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryRebuildCommand();
 });
 memory.command("mcp").description("Show MCP server setup instructions").action(async () => {
-  const { memoryMcpCommand } = await import("./memory-7Q5P7LIU.js");
+  const { memoryMcpCommand } = await import("./memory-KU2MOCPQ.js");
   await memoryMcpCommand();
 });
 memory.command("rm").description("Remove a project database").option("--project-id <id>", "Project ID to remove").option("--all", "Remove all project databases").option(
@@ -144,10 +144,19 @@ memory.command("rm").description("Remove a project database").option("--project-
   "Remove orphaned projects (source dir missing or 0 memories)"
 ).action(
   async (opts) => {
-    const { memoryRmCommand } = await import("./memory-7Q5P7LIU.js");
+    const { memoryRmCommand } = await import("./memory-KU2MOCPQ.js");
     await memoryRmCommand(opts);
   }
 );
+var guide = program.command("guide").description("Manage custom skill guides");
+guide.command("create").description("Create a custom guide for a skill").argument("<skill-name>", "skill to create guide for (e.g. cf-commit)").action(async (skillName) => {
+  const { guideCreateCommand } = await import("./guide-F2FLCDYO.js");
+  guideCreateCommand(skillName);
+});
+guide.command("list").description("List existing custom guides").action(async () => {
+  const { guideListCommand } = await import("./guide-F2FLCDYO.js");
+  guideListCommand();
+});
 var dev = program.command("dev").description("Development mode commands");
 program.addHelpText(
   "after",
@@ -161,35 +170,35 @@ Dev subcommands:
   dev update [path]   Update local dev plugin to latest version`
 );
 dev.command("on").description("Switch to local plugin source").argument("[path]", "path to local coding-friend repo (default: cwd)").action(async (path) => {
-  const { devOnCommand } = await import("./dev-BSXR55PZ.js");
+  const { devOnCommand } = await import("./dev-4OAJCQRQ.js");
   await devOnCommand(path);
 });
 dev.command("off").description("Switch back to remote marketplace").action(async () => {
-  const { devOffCommand } = await import("./dev-BSXR55PZ.js");
+  const { devOffCommand } = await import("./dev-4OAJCQRQ.js");
   await devOffCommand();
 });
 dev.command("status").description("Show current dev mode").action(async () => {
-  const { devStatusCommand } = await import("./dev-BSXR55PZ.js");
+  const { devStatusCommand } = await import("./dev-4OAJCQRQ.js");
   await devStatusCommand();
 });
 dev.command("sync").description(
   "Copy local source files to plugin cache (no version bump needed)"
 ).action(async () => {
-  const { devSyncCommand } = await import("./dev-BSXR55PZ.js");
+  const { devSyncCommand } = await import("./dev-4OAJCQRQ.js");
   await devSyncCommand();
 });
 dev.command("restart").description("Reinstall local dev plugin (off + on)").argument(
   "[path]",
   "path to local coding-friend repo (default: saved path or cwd)"
 ).action(async (path) => {
-  const { devRestartCommand } = await import("./dev-BSXR55PZ.js");
+  const { devRestartCommand } = await import("./dev-4OAJCQRQ.js");
   await devRestartCommand(path);
 });
 dev.command("update").description("Update local dev plugin to latest version (off + on)").argument(
   "[path]",
   "path to local coding-friend repo (default: saved path or cwd)"
 ).action(async (path) => {
-  const { devUpdateCommand } = await import("./dev-BSXR55PZ.js");
+  const { devUpdateCommand } = await import("./dev-4OAJCQRQ.js");
   await devUpdateCommand(path);
 });
 program.hook("postAction", async () => {

package/dist/{init-KX6Y3ELD.js → init-R5L2GAFV.js}

@@ -2,24 +2,24 @@ import {
   ensureMemoryBuilt,
   isMemoryInitialized,
   memoryInitWizard
-} from "./chunk-75IEE2OE.js";
+} from "./chunk-E7OY4UWW.js";
 import {
   memoryConfigMenu
-} from "./chunk-BX3DRKTU.js";
+} from "./chunk-XROT7L2F.js";
 import {
   getLibPath
 } from "./chunk-RZRT7NGT.js";
-import "./chunk-2HQVNQB7.js";
+import "./chunk-J4N2ODQ5.js";
 import {
   findStatuslineHookPath,
   isStatuslineConfigured,
   saveStatuslineConfig,
   selectStatuslineComponents,
   writeStatuslineSettings
-} from "./chunk-GDZTU2Z4.js";
+} from "./chunk-XQ5KAXKL.js";
 import {
   DEFAULT_CONFIG
-} from "./chunk-PRIH34UB.js";
+} from "./chunk-DHH6SRXV.js";
 import {
   ensureShellCompletion,
   hasShellCompletion
@@ -980,7 +980,7 @@ async function initCommand() {
   console.log();
   log.congrats("Setup complete!");
   log.dim(
-    "Available commands: /cf-ask, /cf-plan, /cf-fix, /cf-commit, /cf-review, /cf-review-out, /cf-review-in, /cf-ship, /cf-optimize, /cf-scan, /cf-remember, /cf-learn, /cf-research, /cf-session, /cf-help"
+    "Available commands: /cf-ask, /cf-plan, /cf-fix, /cf-commit, /cf-review, /cf-review-out, /cf-review-in, /cf-ship, /cf-optimize, /cf-scan, /cf-remember, /cf-learn, /cf-teach, /cf-research, /cf-session, /cf-warm, /cf-help"
   );
 }
 export {

package/dist/{install-G4XYNVL3.js → install-XZC6UO54.js}

@@ -1,11 +1,11 @@
 import {
   getLatestVersion,
   semverCompare
-} from "./chunk-YCWRBOB3.js";
+} from "./chunk-RGQGKOBH.js";
 import {
   getInstalledVersion
-} from "./chunk-GDZTU2Z4.js";
-import "./chunk-PRIH34UB.js";
+} from "./chunk-XQ5KAXKL.js";
+import "./chunk-DHH6SRXV.js";
 import {
   ensureShellCompletion
 } from "./chunk-DMJCO6LJ.js";

package/dist/{mcp-DABSO5PE.js → mcp-CNZLJ57B.js}

@@ -1,16 +1,16 @@
 import {
   ensureMemoryBuilt,
   printMemoryMcpConfig
-} from "./chunk-75IEE2OE.js";
-import "./chunk-BX3DRKTU.js";
+} from "./chunk-E7OY4UWW.js";
+import "./chunk-XROT7L2F.js";
 import {
   getLibPath
 } from "./chunk-RZRT7NGT.js";
 import {
   resolveDocsDir,
   resolveMemoryDir
-} from "./chunk-2HQVNQB7.js";
-import "./chunk-PRIH34UB.js";
+} from "./chunk-J4N2ODQ5.js";
+import "./chunk-DHH6SRXV.js";
 import "./chunk-HPNRQYLM.js";
 import {
   run

package/dist/{memory-7Q5P7LIU.js → memory-KU2MOCPQ.js}

@@ -13,11 +13,11 @@ import {
   memoryStatusCommand,
   memoryStopDaemonCommand,
   printMemoryMcpConfig
-} from "./chunk-75IEE2OE.js";
-import "./chunk-BX3DRKTU.js";
+} from "./chunk-E7OY4UWW.js";
+import "./chunk-XROT7L2F.js";
 import "./chunk-RZRT7NGT.js";
-import "./chunk-2HQVNQB7.js";
-import "./chunk-PRIH34UB.js";
+import "./chunk-J4N2ODQ5.js";
+import "./chunk-DHH6SRXV.js";
 import "./chunk-HPNRQYLM.js";
 import "./chunk-EVGXUDX4.js";
 import "./chunk-TWKNGPBO.js";

package/dist/{session-DMQZXZ7F.js → session-ZGNQKV4M.js}

@@ -1,7 +1,7 @@
 import {
   loadConfig
-} from "./chunk-2HQVNQB7.js";
-import "./chunk-PRIH34UB.js";
+} from "./chunk-J4N2ODQ5.js";
+import "./chunk-DHH6SRXV.js";
 import {
   claudeSessionDir,
   encodeProjectPath,
@@ -32,6 +32,10 @@ import {
 } from "fs";
 import { join } from "path";
 import { hostname as osHostname } from "os";
+function slugifyLabel(label, maxLen = 100) {
+  const slug = label.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, maxLen).replace(/-+$/, "");
+  return slug || "session";
+}
 function buildPreviewText(jsonlPath, maxChars = 200) {
   try {
     const content = readFileSync(jsonlPath, "utf-8");
@@ -65,7 +69,10 @@ function listSyncedSessions(syncDir) {
   for (const entry of entries) {
     const metaPath = join(sessionsDir, entry, "meta.json");
     const meta = readJson(metaPath);
-    if (meta) metas.push(meta);
+    if (meta) {
+      if (!meta.folderName) meta.folderName = entry;
+      metas.push(meta);
+    }
   }
   return metas.sort(
     (a, b) => new Date(b.savedAt).getTime() - new Date(a.savedAt).getTime()
@@ -92,13 +99,17 @@ function remapProjectPath(originalPath, currentHome) {
 }
 function saveSession(opts) {
   const { jsonlPath, sessionId, label, projectPath, syncDir, previewText } = opts;
-  const destDir = join(syncDir, "sessions", sessionId);
+  const sessionsDir = join(syncDir, "sessions");
+  const baseSlug = slugifyLabel(label);
+  const folderName = uniqueFolderName(sessionsDir, baseSlug);
+  const destDir = join(sessionsDir, folderName);
   const destJsonl = join(destDir, "session.jsonl");
   const destMeta = join(destDir, "meta.json");
   mkdirSync(destDir, { recursive: true });
   copyFileSync(jsonlPath, destJsonl);
   const meta = {
     sessionId,
+    folderName,
     label,
     projectPath,
     savedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -106,12 +117,20 @@ function saveSession(opts) {
     previewText
   };
   writeJson(destMeta, meta);
+  return folderName;
+}
+function uniqueFolderName(sessionsDir, base) {
+  if (!existsSync(join(sessionsDir, base))) return base;
+  let i = 2;
+  while (existsSync(join(sessionsDir, `${base}-${i}`))) i++;
+  return `${base}-${i}`;
 }
 function loadSession(meta, localProjectPath, syncDir) {
   const encodedPath = encodeProjectPath(localProjectPath);
   const destDir = claudeSessionDir(encodedPath);
   const destPath = join(destDir, `${meta.sessionId}.jsonl`);
-  const srcPath = join(syncDir, "sessions", meta.sessionId, "session.jsonl");
+  const folder = meta.folderName ?? meta.sessionId;
+  const srcPath = join(syncDir, "sessions", folder, "session.jsonl");
   mkdirSync(destDir, { recursive: true });
   copyFileSync(srcPath, destPath);
 }
@@ -184,7 +203,7 @@ async function sessionSaveCommand(opts = {}) {
     default: `session-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 10)}`
   });
   const previewText = buildPreviewText(jsonlPath);
-  saveSession({
+  const folderName = saveSession({
     jsonlPath,
     sessionId,
     label,
@@ -193,7 +212,7 @@ async function sessionSaveCommand(opts = {}) {
     previewText
   });
   log.success(`Session saved: "${label}"`);
-  log.dim(`  \u2192 ${join2(docsDir, "sessions", sessionId)}`);
+  log.dim(`  \u2192 ${join2(docsDir, "sessions", folderName)}`);
 }
 async function sessionLoadCommand() {
   const docsDir = resolveDocsDir();

package/dist/{status-K7TBUAXT.js → status-JXUXVHRH.js}

@@ -3,17 +3,17 @@ import {
 } from "./chunk-RZRT7NGT.js";
 import {
   resolveMemoryDir
-} from "./chunk-2HQVNQB7.js";
+} from "./chunk-J4N2ODQ5.js";
 import {
   getCliVersion,
   getLatestCliVersion,
   getLatestVersion,
   semverCompare
-} from "./chunk-YCWRBOB3.js";
+} from "./chunk-RGQGKOBH.js";
 import {
   getInstalledVersion
-} from "./chunk-GDZTU2Z4.js";
-import "./chunk-PRIH34UB.js";
+} from "./chunk-XQ5KAXKL.js";
+import "./chunk-DHH6SRXV.js";
 import "./chunk-DMJCO6LJ.js";
 import {
   detectPluginScope,

package/dist/{statusline-CDGADB3C.js → statusline-RMTO4MQA.js}

@@ -4,10 +4,10 @@ import {
   saveStatuslineConfig,
   selectStatuslineComponents,
   writeStatuslineSettings
-} from "./chunk-GDZTU2Z4.js";
+} from "./chunk-XQ5KAXKL.js";
 import {
   ALL_COMPONENT_IDS
-} from "./chunk-PRIH34UB.js";
+} from "./chunk-DHH6SRXV.js";
 import {
   commandExists
 } from "./chunk-EVGXUDX4.js";

package/dist/{update-6M3YFHS6.js → update-HS6A2C5V.js}

@@ -4,9 +4,9 @@ import {
   getLatestVersion,
   semverCompare,
   updateCommand
-} from "./chunk-YCWRBOB3.js";
-import "./chunk-GDZTU2Z4.js";
-import "./chunk-PRIH34UB.js";
+} from "./chunk-RGQGKOBH.js";
+import "./chunk-XQ5KAXKL.js";
+import "./chunk-DHH6SRXV.js";
 import "./chunk-DMJCO6LJ.js";
 import "./chunk-HPNRQYLM.js";
 import "./chunk-EVGXUDX4.js";

package/lib/cf-memory/README.md

@@ -48,7 +48,7 @@ Detection: Tier 1 → Tier 2 → Tier 3 (first available wins).
 
 Memories are stored as Markdown files with YAML frontmatter in `docs/memory/<category>/`.
 
-Convention memories (`preference` type → `conventions/` folder) are also synced to the project's `CLAUDE.md` under a `## CF Memory: Conventions` section. Entries are tracked via HTML comments (`<!-- cf:<id> -->`) and are automatically added, updated, or removed when the corresponding memory is stored, updated, or deleted.
+Convention memories (`preference` type → `conventions/` folder) are automatically synced to the project's `CLAUDE.md` under a `## CF Memory: Project Rules` section. Other memory types can opt-in to CLAUDE.md sync by setting `sync_to_claude_md: true` when storing or updating — useful for decisions, infrastructure rules, or any project-wide rules that future sessions must follow. Entries are tracked via HTML comments (`<!-- cf:<id> -->`) and are automatically added, updated, or removed when the corresponding memory is stored, updated, or deleted.
 
 ## Embedding Models
 
@@ -226,12 +226,12 @@ npm run test:watch    # Watch mode
 node dist/daemon/entry.js ./docs/memory
 
 # With idle timeout (ms) and tier
-node dist/daemon/entry.js ./docs/memory 1800000 --tier=lite
+node dist/daemon/entry.js ./docs/memory 0 --tier=lite
 ```
 
 The daemon runs a Hono HTTP server on a Unix Domain Socket at `~/.coding-friend/memory/daemon.sock`, with PID tracking at `~/.coding-friend/memory/daemon.pid`.
 
-**Auto-reconnect:** If the daemon dies (e.g., idle timeout expires), the `DaemonClient` automatically respawns it on the next request. This means mid-session daemon restarts are transparent — no manual intervention needed.
+**Auto-reconnect with retry:** If the daemon dies (e.g., crash or explicit stop), the `DaemonClient` automatically respawns it on the next request with up to 3 retry attempts (1-second delay between retries). If all retries fail, it falls back to Tier 3 (markdown grep). This means mid-session daemon restarts are transparent — no manual intervention needed.
 
 ### Lazy dependencies (Tier 1)
 
@@ -306,7 +306,7 @@ If these are missing, `cf memory init` will fail at the "Installing SQLite depen
 | ----------------------------- | ------------------------ | ------------------------------------------------- |
 | `MEMORY_DOCS_DIR`             | `./docs/memory`          | Path to memory storage directory                  |
 | `MEMORY_TIER`                 | `auto`                   | Force a tier: `auto`, `full`, `lite`, `markdown`  |
-| `MEMORY_DAEMON_IDLE_TIMEOUT`  | `1800000` (30 min)       | Daemon idle timeout in ms (`0` = never auto-stop) |
+| `MEMORY_DAEMON_IDLE_TIMEOUT`  | `0` (no timeout)         | Daemon idle timeout in ms (`0` = never auto-stop) |
 | `MEMORY_EMBEDDING_PROVIDER`   | `transformers`           | Embedding provider: `transformers` or `ollama`    |
 | `MEMORY_EMBEDDING_MODEL`      | (provider default)       | Embedding model name (e.g., `nomic-embed-text`)   |
 | `MEMORY_EMBEDDING_OLLAMA_URL` | `http://localhost:11434` | Ollama server URL                                 |

package/lib/cf-memory/src/__tests__/claude-md.test.ts

@@ -236,3 +236,108 @@ describe("syncToClaudeMd with realistic docsDir", () => {
     expect(content).toContain(SECTION_HEADER);
   });
 });
+
+describe("migration from old header", () => {
+  const OLD_HEADER = "## CF Memory: Conventions";
+
+  it("reads entries from old header and rewrites with new header on sync", () => {
+    writeFileSync(
+      claudeMdFile,
+      `# My Project\n\n${OLD_HEADER}\n\n- Old rule <!-- cf:conventions/old-rule -->\n`,
+    );
+
+    syncToClaudeMd(testDir, "conventions/new-rule", "New rule");
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    // Should have new header
+    expect(content).toContain(SECTION_HEADER);
+    // Should NOT have old header (unless they're the same)
+    if (SECTION_HEADER !== OLD_HEADER) {
+      expect(content).not.toContain(OLD_HEADER);
+    }
+    // Both entries should be preserved
+    expect(content).toContain("Old rule");
+    expect(content).toContain("New rule");
+  });
+
+  it("removes entries from old header format", () => {
+    writeFileSync(
+      claudeMdFile,
+      `# My Project\n\n${OLD_HEADER}\n\n- Old rule <!-- cf:conventions/old-rule -->\n- Keep this <!-- cf:conventions/keep -->\n`,
+    );
+
+    removeFromClaudeMd(testDir, "conventions/old-rule");
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).not.toContain("Old rule");
+    expect(content).toContain("Keep this");
+  });
+});
+
+describe("syncToClaudeMd with non-convention categories", () => {
+  it("syncs decisions entries to CLAUDE.md", () => {
+    syncToClaudeMd(
+      testDir,
+      "decisions/api-versioning",
+      "Always use URL-based API versioning (v1, v2)",
+    );
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).toContain(SECTION_HEADER);
+    expect(content).toContain("Always use URL-based API versioning");
+    expect(content).toContain("<!-- cf:decisions/api-versioning -->");
+  });
+
+  it("syncs infrastructure entries to CLAUDE.md", () => {
+    syncToClaudeMd(
+      testDir,
+      "infrastructure/deploy-checklist",
+      "Always run migrations before deploying",
+    );
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).toContain("Always run migrations before deploying");
+    expect(content).toContain("<!-- cf:infrastructure/deploy-checklist -->");
+  });
+
+  it("mixes convention and non-convention entries in same section", () => {
+    syncToClaudeMd(testDir, "conventions/naming", "Use camelCase");
+    syncToClaudeMd(
+      testDir,
+      "decisions/db-choice",
+      "Use PostgreSQL for all new services",
+    );
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).toContain("Use camelCase");
+    expect(content).toContain("Use PostgreSQL for all new services");
+    // Only one section header
+    const headerCount = content.split(SECTION_HEADER).length - 1;
+    expect(headerCount).toBe(1);
+  });
+
+  it("removes non-convention entries by ID", () => {
+    syncToClaudeMd(testDir, "decisions/api-versioning", "URL-based versioning");
+    syncToClaudeMd(testDir, "conventions/naming", "Use camelCase");
+
+    removeFromClaudeMd(testDir, "decisions/api-versioning");
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).not.toContain("URL-based versioning");
+    expect(content).toContain("Use camelCase");
+  });
+
+  it("updates non-convention entries", () => {
+    syncToClaudeMd(testDir, "infrastructure/ci-rule", "Run lint before tests");
+
+    updateInClaudeMd(
+      testDir,
+      "infrastructure/ci-rule",
+      "Run lint and type-check before tests",
+    );
+
+    const content = readFileSync(claudeMdFile, "utf-8");
+    expect(content).toContain("Run lint and type-check before tests");
+    expect(content).not.toContain("Run lint before tests\n");
+  });
+});

package/lib/cf-memory/src/__tests__/tier.test.ts

@@ -289,6 +289,65 @@ describe("createBackendForTier() with embeddingConfig", () => {
   });
 });
 
+describe("makeRespawn retry logic", () => {
+  it("retries up to 3 times before giving up", async () => {
+    const daemonProcess = await import("../daemon/process.js");
+
+    let attempts = 0;
+    const spawnSpy = vi
+      .spyOn(daemonProcess, "spawnDaemon")
+      .mockImplementation(async () => {
+        attempts++;
+        return null; // always fail
+      });
+    // Isolate from real daemon state on the host machine
+    const runningSpy = vi
+      .spyOn(daemonProcess, "isDaemonRunning")
+      .mockResolvedValue(false);
+
+    // Use createBackendForTier with "lite" to trigger respawn path
+    // The respawn callback wraps makeRespawn which calls spawnDaemon
+    // We need to get the respawn function indirectly
+    // Instead, test via the exported createRespawnWithRetry
+    const { createRespawnWithRetry } = await import("../lib/tier.js");
+    const respawn = createRespawnWithRetry(".", undefined, undefined);
+    const result = await respawn();
+
+    expect(result).toBe(false);
+    expect(attempts).toBe(3);
+
+    spawnSpy.mockRestore();
+    runningSpy.mockRestore();
+  });
+
+  it("succeeds on second attempt", async () => {
+    const daemonProcess = await import("../daemon/process.js");
+
+    let attempts = 0;
+    const spawnSpy = vi
+      .spyOn(daemonProcess, "spawnDaemon")
+      .mockImplementation(async () => {
+        attempts++;
+        if (attempts === 2) return { pid: 1234 };
+        return null;
+      });
+    // Isolate from real daemon state on the host machine
+    const runningSpy = vi
+      .spyOn(daemonProcess, "isDaemonRunning")
+      .mockResolvedValue(false);
+
+    const { createRespawnWithRetry } = await import("../lib/tier.js");
+    const respawn = createRespawnWithRetry(".", undefined, undefined);
+    const result = await respawn();
+
+    expect(result).toBe(true);
+    expect(attempts).toBe(2);
+
+    spawnSpy.mockRestore();
+    runningSpy.mockRestore();
+  });
+});
+
 describe("TIERS constant", () => {
   it("has all 3 tier definitions", () => {
     expect(Object.keys(TIERS)).toHaveLength(3);

package/lib/cf-memory/src/daemon/process.ts

@@ -6,7 +6,7 @@ import { getRequestListener } from "@hono/node-server";
 import { createDaemonApp } from "./server.js";
 import type { MemoryBackend } from "../lib/backend.js";
 
-const DEFAULT_IDLE_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
+const DEFAULT_IDLE_TIMEOUT_MS = 0; // 0 = no timeout, run until explicitly stopped
 
 export interface DaemonPaths {
   socketPath: string;