moflo 4.9.35 → 4.9.36

package/dist/src/cli/init/moflo-init.js

@@ -435,7 +435,7 @@ function generateClaudeMd(root, _force) {
 // scriptFiles array in bin/session-start-launcher.mjs — first-init drops any
 // script missing here, and the launcher's manifest cleanup later treats it as
 // orphan residue and deletes it (#777, feedback_scriptfiles_sync.md).
-const SCRIPT_MAP = [
+export const SCRIPT_MAP = [
     'hooks.mjs',
     'session-start-launcher.mjs',
     'index-guidance.mjs',
@@ -496,17 +496,25 @@ function isStale(srcPath, destPath) {
 // ============================================================================
 // Step 6: .gitignore
 // ============================================================================
-function updateGitignore(root) {
+export function updateGitignore(root) {
     const gitignorePath = path.join(root, '.gitignore');
     const entries = [
         '.claude-epic/',
         '.moflo/',
         '.swarm/',
-        '.moflo/',
         '.claude/settings.local.json',
         '.claude/scheduled_tasks.lock',
         '**/workflow-state.json',
+        // Leading `/` anchors to gitignore root — bare `.claude/guidance/` once
+        // swallowed shipped/internal subdirs and broke `npm pack`
+        // (guidance-gitignore-shipped-trap).
+        '/.claude/guidance/moflo-*.md',
+        ...SCRIPT_MAP.map(name => `/.claude/scripts/${name}`),
     ];
+    // Treat `/.foo` and `.foo` as the same rule when checking for prior presence
+    // — both forms anchor at gitignore root, so a consumer who wrote either
+    // shouldn't get a duplicate appended.
+    const normalize = (s) => s.replace(/^\//, '');
     if (!fs.existsSync(gitignorePath)) {
         const defaultEntries = ['node_modules/', 'dist/', '.env', '.env.*', ''];
         const content = '# Dependencies\n' + defaultEntries.join('\n') + '\n# MoFlo state\n' + entries.join('\n') + '\n';
@@ -514,8 +522,8 @@ function updateGitignore(root) {
         return { name: '.gitignore', status: 'created', detail: 'Created with node_modules, .env, and MoFlo entries' };
     }
     const existing = fs.readFileSync(gitignorePath, 'utf-8');
-    const existingLines = new Set(existing.split(/\r?\n/).map(l => l.trim()).filter(l => l && !l.startsWith('#')));
-    const toAdd = entries.filter(e => !existingLines.has(e));
+    const existingLines = new Set(existing.split(/\r?\n/).map(l => normalize(l.trim())).filter(l => l && !l.startsWith('#')));
+    const toAdd = entries.filter(e => !existingLines.has(normalize(e)));
     if (toAdd.length === 0) {
         return { name: '.gitignore', status: 'skipped', detail: 'Entries already present' };
     }

package/dist/src/cli/memory/auto-memory-bridge.js

@@ -12,11 +12,11 @@
  * @module moflo/cli/memory/auto-memory-bridge
  */
 import { createHash } from 'node:crypto';
-import { homedir } from 'node:os';
 import { EventEmitter } from 'node:events';
 import * as fs from 'node:fs/promises';
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import * as path from 'node:path';
+import { claudeProjectDirFor } from '../shared/utils/claude-projects-path.js';
 import { createDefaultEntry, } from './types.js';
 import { LearningBridge } from './learning-bridge.js';
 import { MemoryGraph } from './memory-graph.js';
@@ -539,20 +539,17 @@ export class AutoMemoryBridge extends EventEmitter {
 // ===== Utility Functions =====
 /**
  * Resolve the auto memory directory for a given working directory.
- * Mirrors Claude Code's path derivation from git root.
+ *
+ * The git root is preferred over the raw cwd so a session in
+ * `<repo>/packages/foo` resolves to the repo's auto-memory store, matching
+ * Claude Code's own behaviour. The encoded suffix is produced by the shared
+ * `claudeProjectDirFor` helper so this bridge cannot drift away from the
+ * Claude Code directory naming convention (issue #1048).
  */
 export function resolveAutoMemoryDir(workingDir) {
     const gitRoot = findGitRoot(workingDir);
     const basePath = gitRoot || workingDir;
-    // Claude Code normalizes to forward slashes then replaces with dashes
-    // The leading dash IS preserved (e.g. /workspaces/foo -> -workspaces-foo)
-    // On Windows, strip drive letter prefix (C:) for cleaner keys
-    let normalized = basePath.split(path.sep).join('/');
-    if (process.platform === 'win32') {
-        normalized = normalized.replace(/^[A-Za-z]:/, '');
-    }
-    const projectKey = normalized.replace(/\//g, '-');
-    return path.join(homedir(), '.claude', 'projects', projectKey, 'memory');
+    return path.join(claudeProjectDirFor(basePath), 'memory');
 }
 /**
  * Find the git root directory by walking up from workingDir.

package/dist/src/cli/services/claude-stats.js

@@ -22,9 +22,10 @@
  */
 import { createReadStream } from 'node:fs';
 import { stat, readdir } from 'node:fs/promises';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline';
+import { claudeProjectDirFor, encodeCwdForClaudeProjects, } from '../shared/utils/claude-projects-path.js';
+export { claudeProjectDirFor, encodeCwdForClaudeProjects };
 /**
  * Map a transcript model name to a stable display key. Recognises bare family
  * names ("opus", "sonnet", "haiku"), dated/dotted variants
@@ -43,21 +44,6 @@ export function canonicalModelKey(model) {
         return 'haiku';
     return 'unknown';
 }
-// ============================================================================
-// Path resolution
-// ============================================================================
-/**
- * Encode a CWD the same way Claude Code does for `~/.claude/projects/<dir>`.
- * Replaces `\`, `/`, and `:` with `-` so `C:\Users\eric\Projects\moflo` →
- * `C--Users-eric-Projects-moflo`.
- */
-export function encodeCwdForClaudeProjects(cwd) {
-    return cwd.replace(/[\\/:]/g, '-');
-}
-/** Absolute path to `~/.claude/projects/<encoded-cwd>` for the given CWD. */
-export function claudeProjectDirFor(cwd) {
-    return join(homedir(), '.claude', 'projects', encodeCwdForClaudeProjects(cwd));
-}
 const CACHE_TTL_MS = 30_000;
 let cache = null;
 /** Test-only — drop the in-memory cache so the next call re-aggregates. */

package/dist/src/cli/shared/utils/claude-projects-path.js

@@ -0,0 +1,32 @@
+/**
+ * Encode a working directory the same way Claude Code does for its
+ * `~/.claude/projects/<dir>/` transcript & memory store.
+ *
+ * Claude Code replaces *every* non-alphanumeric character in the absolute
+ * path with `-`. Earlier moflo versions used a narrower class (`/[\\/:]/g`,
+ * or split-and-rejoin variants) which agreed with Claude Code only for
+ * paths whose every other character was alphanumeric — issue #1048.
+ *
+ * Centralised here so the stats aggregator and the auto-memory bridge
+ * cannot drift apart.
+ */
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+/**
+ * Encode a CWD to the form Claude Code uses as a `~/.claude/projects/`
+ * subdirectory name. Replaces every non-alphanumeric character with `-`.
+ *
+ * @example
+ *   encodeCwdForClaudeProjects('C:\\Users\\me\\some_project')
+ *     → 'C--Users-me-some-project'
+ *   encodeCwdForClaudeProjects('/Users/me/dev/some_project')
+ *     → '-Users-me-dev-some-project'
+ */
+export function encodeCwdForClaudeProjects(cwd) {
+    return cwd.replace(/[^A-Za-z0-9]/g, '-');
+}
+/** Absolute path to `~/.claude/projects/<encoded-cwd>` for the given CWD. */
+export function claudeProjectDirFor(cwd) {
+    return join(homedir(), '.claude', 'projects', encodeCwdForClaudeProjects(cwd));
+}
+//# sourceMappingURL=claude-projects-path.js.map

package/dist/src/cli/version.js

@@ -2,5 +2,5 @@
  * Auto-generated by build. Do not edit manually.
  * Source of truth: root package.json → scripts/sync-version.mjs
  */
-export const VERSION = '4.9.35';
+export const VERSION = '4.9.36';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moflo",
-  "version": "4.9.35",
+  "version": "4.9.36",
   "description": "MoFlo — AI agent orchestration for Claude Code. A standalone, opinionated toolkit with semantic memory, learned routing, gates, spells, and the /flo issue-execution skill.",
   "main": "dist/src/cli/index.js",
   "type": "module",
@@ -97,7 +97,7 @@
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "eslint": "^8.0.0",
-    "moflo": "^4.9.34",
+    "moflo": "^4.9.35",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.0"