moflo 4.9.34 → 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

@@ -5,6 +5,12 @@
  * the JSON shape consumed by The Luminarium's "Claude Stats" tab. Pure I/O
  * + reduce; no persistent storage, no network.
  *
+ * Scope: primary-session transcripts only (top-level `*.jsonl`). Per-session
+ * `<id>/subagents/agent-*.jsonl` files (Task-tool spawns) are NOT walked, so
+ * Sonnet/Haiku usage from /simplify, /ultrareview, etc. is missing from the
+ * model distribution. Tracked as a follow-up — when wiring it up, recurse
+ * into `subagents/` and roll the subagent mtimes/sizes into the cache key.
+ *
  * Performance posture:
  *   - Streaming readline (not `readFileSync().split('\n')`) — transcripts
  *     can grow to tens of MB and we don't want to balloon dashboard memory.
@@ -16,24 +22,27 @@
  */
 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 { canonicalModelKey, costFromUsage, rateForModel } from './claude-model-rates.js';
-// ============================================================================
-// Path resolution
-// ============================================================================
+import { claudeProjectDirFor, encodeCwdForClaudeProjects, } from '../shared/utils/claude-projects-path.js';
+export { claudeProjectDirFor, encodeCwdForClaudeProjects };
 /**
- * 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`.
+ * Map a transcript model name to a stable display key. Recognises bare family
+ * names ("opus", "sonnet", "haiku"), dated/dotted variants
+ * ("claude-opus-4-7", "claude-3-5-sonnet-20241022"), and is case-insensitive.
+ * Anything else falls through to `'unknown'`.
  */
-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));
+export function canonicalModelKey(model) {
+    if (!model || typeof model !== 'string')
+        return 'unknown';
+    const lower = model.toLowerCase();
+    if (lower.includes('opus'))
+        return 'opus';
+    if (lower.includes('sonnet'))
+        return 'sonnet';
+    if (lower.includes('haiku'))
+        return 'haiku';
+    return 'unknown';
 }
 const CACHE_TTL_MS = 30_000;
 let cache = null;
@@ -46,7 +55,7 @@ export function _resetClaudeStatsCache() {
 // ============================================================================
 const DAY_MS = 86_400_000;
 function emptyWindow() {
-    return { sessions: new Set(), input: 0, output: 0, cacheCreate: 0, cacheRead: 0, costUsd: 0 };
+    return { sessions: new Set(), input: 0, output: 0, cacheCreate: 0, cacheRead: 0 };
 }
 function freezeWindow(w) {
     const total = w.input + w.output + w.cacheCreate + w.cacheRead;
@@ -59,12 +68,8 @@ function freezeWindow(w) {
             cacheRead: w.cacheRead,
             total,
         },
-        costUsd: round4(w.costUsd),
     };
 }
-function round4(n) {
-    return Math.round(n * 10_000) / 10_000;
-}
 function makeAggregator() {
     return {
         today: emptyWindow(),
@@ -126,31 +131,28 @@ function consumeLine(agg, line, now) {
     const cr = usage.cache_read_input_tokens ?? 0;
     const totalThisLine = input + output + cc + cr;
     const modelKey = canonicalModelKey(line.message?.model);
-    const rate = rateForModel(line.message?.model);
-    const cost = costFromUsage(rate, { input, output, cacheCreate: cc, cacheRead: cr });
     agg.modelMessages.set(modelKey, (agg.modelMessages.get(modelKey) ?? 0) + 1);
     agg.modelTokens.set(modelKey, (agg.modelTokens.get(modelKey) ?? 0) + totalThisLine);
     // Lifetime always.
-    bump(agg.lifetime, sessionId, input, output, cc, cr, cost);
+    bump(agg.lifetime, sessionId, input, output, cc, cr);
     // Bucketed windows — only when we have a usable timestamp.
     if (Number.isFinite(ts)) {
         const ageMs = now - ts;
         if (ageMs >= 0 && ageMs < DAY_MS)
-            bump(agg.today, sessionId, input, output, cc, cr, cost);
+            bump(agg.today, sessionId, input, output, cc, cr);
         if (ageMs >= 0 && ageMs < 7 * DAY_MS)
-            bump(agg.last7d, sessionId, input, output, cc, cr, cost);
+            bump(agg.last7d, sessionId, input, output, cc, cr);
         if (ageMs >= 0 && ageMs < 30 * DAY_MS)
-            bump(agg.last30d, sessionId, input, output, cc, cr, cost);
+            bump(agg.last30d, sessionId, input, output, cc, cr);
     }
 }
-function bump(w, sessionId, input, output, cc, cr, cost) {
+function bump(w, sessionId, input, output, cc, cr) {
     if (sessionId)
         w.sessions.add(sessionId);
     w.input += input;
     w.output += output;
     w.cacheCreate += cc;
     w.cacheRead += cr;
-    w.costUsd += cost;
 }
 // ============================================================================
 // File walking

package/dist/src/cli/services/daemon-dashboard.js

@@ -1056,25 +1056,19 @@ const DASHBOARD_HTML = `<!DOCTYPE html>
       if (n < 1_000_000_000) return (n / 1_000_000).toFixed(2) + 'M';
       return (n / 1_000_000_000).toFixed(2) + 'B';
     };
-    // USD with two decimals; sub-cent renders as "<$0.01".
-    const fmtUsd = (n) => {
-      if (n == null) return '-';
-      if (n === 0) return '$0.00';
-      if (n < 0.01) return '<$0.01';
-      return '$' + n.toFixed(2);
-    };
-
     function renderClaudeStats(cs) {
       const el = document.getElementById('panel-claude-stats');
       if (!cs) { el.innerHTML = '<div class="empty">Loading...</div>'; return; }
 
-      // Always-visible disclaimer banner — kept verbatim per the issue's
-      // wording so the user understands the scope and limits at a glance.
+      // Always-visible disclaimer banner — keeps the scope and limits in
+      // view so the numbers aren't read as account-wide truth.
       const disclaimer =
         '<div style="background:#161b22;border:1px solid #30363d;border-left:3px solid #d29922;border-radius:6px;padding:10px 14px;margin-bottom:16px;color:#c9d1d9;font-size:0.85rem;line-height:1.5">' +
-        '<strong>Local stats only.</strong> Counts what Claude Code wrote to disk for THIS project on THIS machine. ' +
-        'Doesn\\'t include claude.ai web sessions, other projects, other devices, or your account-level plan quota. ' +
-        'Cost is a local estimate using current public model rates.' +
+        '<strong>Local primary-session stats only.</strong> Counts what Claude Code wrote to disk for THIS project on THIS machine. ' +
+        '<strong>Excludes sub-sessions spawned by Task-tool agents</strong> ' +
+        '(e.g. <code>/simplify</code>, <code>/ultrareview</code>, Explore) — their Sonnet/Haiku usage is stored in per-session ' +
+        '<code>subagents/</code> transcripts the dashboard doesn\\'t yet read, so totals here skew toward the primary model. ' +
+        'Also excludes claude.ai web sessions, other projects, other devices, and your account-level plan quota.' +
         '</div>';
 
       if (!cs.available) {
@@ -1095,14 +1089,13 @@ const DASHBOARD_HTML = `<!DOCTYPE html>
           '<td>' + fmtCount(win.tokens.input) + '</td>' +
           '<td>' + fmtCount(win.tokens.output) + '</td>' +
           '<td>' + fmtCount(win.tokens.cacheCreate) + '</td>' +
-          '<td>' + fmtCount(win.tokens.cacheRead) + '</td>' +
-          '<td>' + fmtUsd(win.costUsd) + '</td></tr>';
+          '<td>' + fmtCount(win.tokens.cacheRead) + '</td></tr>';
       };
       const winTable =
-        '<h2>Sessions, Tokens, Cost</h2>' +
+        '<h2>Sessions and Tokens</h2>' +
         '<table><thead><tr>' +
           '<th>Window</th><th>Sessions</th><th>Total Tokens</th>' +
-          '<th>Input</th><th>Output</th><th>Cache Create</th><th>Cache Read</th><th>Est. Cost</th>' +
+          '<th>Input</th><th>Output</th><th>Cache Create</th><th>Cache Read</th>' +
         '</tr></thead><tbody>' +
         winRow('Today', w.today) +
         winRow('Last 7 days', w.last7d) +
@@ -1117,7 +1110,7 @@ const DASHBOARD_HTML = `<!DOCTYPE html>
             '<td>' + fmtCount(m.tokens) + '</td></tr>').join('')
         : '<tr><td colspan="3" class="empty">No model data</td></tr>';
       const modelsTable =
-        '<h2>Models Used</h2>' +
+        '<h2>Models Used (primary sessions)</h2>' +
         '<table><thead><tr><th>Model</th><th>Messages</th><th>Total Tokens</th></tr></thead>' +
         '<tbody>' + modelRows + '</tbody></table>';
 
@@ -1139,11 +1132,9 @@ const DASHBOARD_HTML = `<!DOCTYPE html>
         '<div class="stat-card"><div class="label">p95 Duration</div><div class="value">' + fmtDuration(cs.sessionDurationMs.p95) + '</div></div>' +
         '</div>';
 
-      // Footer note linking to the rate-table source comment.
       const footer =
         '<div class="dim" style="margin-top:12px">' +
-        'Cost estimate uses rates from <code>src/cli/services/claude-model-rates.ts</code> ' +
-        '(USD/1M tokens, list price). Aggregation took ' + fmtDuration(cs.elapsedMs) +
+        'Aggregation took ' + fmtDuration(cs.elapsedMs) +
         (cs.parseErrors ? ' &middot; ' + cs.parseErrors + ' lines skipped (parse error)' : '') +
         '</div>';
 

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.34';
+export const VERSION = '4.9.36';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moflo",
-  "version": "4.9.34",
+  "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.33",
+    "moflo": "^4.9.35",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.0.0"

package/dist/src/cli/services/claude-model-rates.js

@@ -1,54 +0,0 @@
-/**
- * Per-model USD/1M rates. Lookup goes through {@link rateForModel}, which
- * normalises the transcript's loose model names ("opus", "claude-opus-4-7",
- * "haiku-4-5", etc.) onto a canonical key.
- */
-export const CLAUDE_RATES = {
-    // Opus 4.x family
-    opus: { input: 15, output: 75, cacheCreate: 18.75, cacheRead: 1.5 },
-    // Sonnet 4.x family
-    sonnet: { input: 3, output: 15, cacheCreate: 3.75, cacheRead: 0.3 },
-    // Haiku 4.x family
-    haiku: { input: 0.8, output: 4, cacheCreate: 1, cacheRead: 0.08 },
-    // Unknown — zeroed out so the cost UI shows $0 for unrecognised models
-    // rather than guessing wrong. The model name still surfaces in the
-    // distribution card so the user can see the gap.
-    unknown: { input: 0, output: 0, cacheCreate: 0, cacheRead: 0 },
-};
-/** Canonical model keys, ordered most-expensive → cheapest for stable display. */
-export const CANONICAL_MODELS = ['opus', 'sonnet', 'haiku', 'unknown'];
-/**
- * Map a transcript model name to a canonical rate key. Recognises:
- *   - bare family names: "opus", "sonnet", "haiku"
- *   - dated/dotted variants: "claude-opus-4-7", "claude-3-5-sonnet-20241022"
- *   - case-insensitive
- * Anything else falls through to `'unknown'`.
- */
-export function canonicalModelKey(model) {
-    if (!model || typeof model !== 'string')
-        return 'unknown';
-    const lower = model.toLowerCase();
-    if (lower.includes('opus'))
-        return 'opus';
-    if (lower.includes('sonnet'))
-        return 'sonnet';
-    if (lower.includes('haiku'))
-        return 'haiku';
-    return 'unknown';
-}
-/** Resolve a `ClaudeRate` row for the given (possibly raw) model name. */
-export function rateForModel(model) {
-    return CLAUDE_RATES[canonicalModelKey(model)] ?? CLAUDE_RATES.unknown;
-}
-/**
- * Compute USD cost for a single usage record.
- * Rates are per 1M tokens; divide by 1e6 once at the end.
- */
-export function costFromUsage(rate, usage) {
-    const i = usage.input ?? 0;
-    const o = usage.output ?? 0;
-    const cc = usage.cacheCreate ?? 0;
-    const cr = usage.cacheRead ?? 0;
-    return ((i * rate.input + o * rate.output + cc * rate.cacheCreate + cr * rate.cacheRead) / 1_000_000);
-}
-//# sourceMappingURL=claude-model-rates.js.map