n2-soul 6.1.3 → 6.1.4

package/.gitattributes

@@ -0,0 +1,13 @@
+# Normalize line endings to LF on commit
+* text=auto eol=lf
+
+# Ensure these are always LF
+*.js text eol=lf
+*.json text eol=lf
+*.md text eol=lf
+*.n2 text eol=lf
+
+# Binary files
+*.png binary
+*.jpg binary
+*.ico binary

package/index.js

@@ -15,9 +15,10 @@ const { registerEndSequence } = require('./sequences/end');
 const { registerBrainTools } = require('./tools/brain');
 const { registerKVCacheTools } = require('./tools/kv-cache');
 
+const pkg = require('./package.json');
 const server = new McpServer({
     name: 'n2-soul',
-    version: '6.1.1',
+    version: pkg.version,
 });
 
 // ═══════════════════════════════════════════════════════
@@ -29,9 +30,10 @@ const server = new McpServer({
 // The RULES decide what's blocked — not the code.
 // ═══════════════════════════════════════════════════════
 const ark = createArk({
-    rulesDir: config.ARK?.rulesDir || path.join(__dirname, 'rules'),
-    auditDir: config.ARK?.auditDir || path.join(config.DATA_DIR, 'ark-audit'),
-    strictMode: config.ARK?.strictMode || false,
+    rulesDir: config.ARK?.rulesDir ?? path.join(__dirname, 'rules'),
+    auditDir: config.ARK?.auditDir ?? path.join(config.DATA_DIR, 'ark-audit'),
+    strictMode: config.ARK?.strictMode ?? false,
+    auditMaxAgeDays: config.ARK?.auditMaxAgeDays ?? 7,
     auditEnabled: true,
 });
 

package/lib/ark/index.js

@@ -23,16 +23,16 @@ function createArk(options = {}) {
     // Load and parse all .n2 rule files
     const rules = loadRules(rulesDir);
 
-    // Create audit logger
     const audit = new AuditLogger({
         dir: auditDir,
         enabled: options.auditEnabled !== false,
-        logPasses: options.auditPasses || false,
+        logPasses: options.auditPasses ?? false,
+        maxAgeDays: options.auditMaxAgeDays ?? 7,
     });
 
     // Create safety gate with audit hooks
     const gate = new SafetyGate(rules, {
-        strictMode: options.strictMode || false,
+        strictMode: options.strictMode ?? false,
         onBlock: (result) => audit.log(result, { type: result.type }),
         onPass: (result) => audit.log(result, { type: result.type }),
     });

package/lib/ark/parser.js

@@ -193,26 +193,56 @@ function extractPatterns(body) {
  */
 function parseGates(source) {
     const gates = {};
-    const gateRegex = /@gate\s+(\w+)\s*\{([^}]*)\}/g;
-    let match;
+    const lines = source.split('\n');
 
-    while ((match = gateRegex.exec(source)) !== null) {
-        const name = match[1];
-        const body = match[2];
+    let inGate = false;
+    let gateName = '';
+    let braceDepth = 0;
+    let bodyLines = [];
 
-        const actionsMatch = body.match(/actions\s*:\s*\[([^\]]+)\]/);
-        const actions = actionsMatch
-            ? actionsMatch[1].split(',').map(a => a.trim().replace(/["']/g, ''))
-            : [];
+    for (const line of lines) {
+        const trimmed = line.trim();
 
-        const requiresMatch = body.match(/requires\s*:\s*(\w+)/);
-        const requires = requiresMatch ? requiresMatch[1] : 'human_approval';
+        if (!inGate) {
+            const m = trimmed.match(/^@gate\s+(\w+)\s*\{?/);
+            if (m) {
+                inGate = true;
+                gateName = m[1];
+                braceDepth = (trimmed.includes('{')) ? 1 : 0;
+                bodyLines = [];
+                continue;
+            }
+        }
 
-        const minMatch = body.match(/min_approval_level\s*:\s*(\d+)/);
-        const minApproval = minMatch ? parseInt(minMatch[1], 10) : 1;
+        if (inGate) {
+            bodyLines.push(line);
+            for (const ch of line) {
+                if (ch === '{') braceDepth++;
+                if (ch === '}') braceDepth--;
+            }
 
-        if (actions.length > 0) {
-            gates[name] = { actions, requires, minApproval };
+            if (braceDepth <= 0) {
+                const body = bodyLines.join('\n');
+
+                const actionsMatch = body.match(/actions\s*:\s*\[([^\]]+)\]/);
+                const actions = actionsMatch
+                    ? actionsMatch[1].split(',').map(a => a.trim().replace(/["']/g, ''))
+                    : [];
+
+                const requiresMatch = body.match(/requires\s*:\s*(\w+)/);
+                const requires = requiresMatch ? requiresMatch[1] : 'human_approval';
+
+                const minMatch = body.match(/min_approval_level\s*:\s*(\d+)/);
+                const minApproval = minMatch ? parseInt(minMatch[1], 10) : 1;
+
+                if (actions.length > 0) {
+                    gates[gateName] = { actions, requires, minApproval };
+                }
+
+                inGate = false;
+                gateName = '';
+                bodyLines = [];
+            }
         }
     }
 

package/lib/config.default.js

@@ -37,6 +37,12 @@ module.exports = {
         childLimit: 20,
     },
 
+    // Work sequence settings
+    WORK: {
+        sessionTtlHours: 24,       // Auto-expire stale work sessions
+        maxDecisions: 20,          // Max decisions kept on soul-board
+    },
+
     // KV-Cache settings
     KV_CACHE: {
         enabled: true,
@@ -77,5 +83,6 @@ module.exports = {
         rulesDir: null,     // null = soul/rules/
         auditDir: null,     // null = soul/data/ark-audit/
         strictMode: false,  // true = block unknown actions too
+        auditMaxAgeDays: 7, // Auto-cleanup audit logs after N days
     },
 };

package/lib/intercom-log.js

@@ -51,7 +51,7 @@ function normalizeName(name) {
 // ── Path helpers ──
 
 function getConversationsDir(config) {
-    const dataDir = config?.dataDir || path.join(__dirname, '..', 'data');
+    const dataDir = config?.dataDir || config?.DATA_DIR || path.join(__dirname, '..', 'data');
     return path.join(dataDir, 'conversations');
 }
 

package/lib/paths.js

@@ -1,16 +1,23 @@
 // Soul MCP v6.0 — Central path manager. Cross-platform compatible.
-// NOTE: DATA_ROOT here is a fallback for agent-registry only.
-// For Cloud Storage, use config.DATA_DIR (set in config.local.js).
 const path = require('path');
 const fs = require('fs');
 
 // soul/lib/paths.js → 2 levels up = project root
 const PROJECT_ROOT = path.resolve(__dirname, '..', '..');
+// Local fallback only — always use config.DATA_DIR when available
 const DATA_ROOT = path.join(path.resolve(__dirname, '..'), 'data');
 
 /** Agents directory path (auto-created if needed) */
 function getAgentsDir() {
-    const dir = path.join(DATA_ROOT, 'agents');
+    // Prefer config.DATA_DIR (supports Cloud Storage) over local fallback
+    let dataDir;
+    try {
+        const config = require('./config');
+        dataDir = config.DATA_DIR || DATA_ROOT;
+    } catch (e) {
+        dataDir = DATA_ROOT;
+    }
+    const dir = path.join(dataDir, 'agents');
     if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
     return dir;
 }

package/lib/utils.js

@@ -2,8 +2,19 @@
 const fs = require('fs');
 const path = require('path');
 
-// Timezone: configurable via N2_TIMEZONE env or config.TIMEZONE
-const _tz = process.env.N2_TIMEZONE || 'Asia/Seoul';
+// Timezone: prioritizes env > config.TIMEZONE > fallback 'Asia/Seoul'
+let _tz = null;
+function _getTimezone() {
+    if (!_tz) {
+        try {
+            const config = require('./config');
+            _tz = process.env.N2_TIMEZONE || config.TIMEZONE || 'Asia/Seoul';
+        } catch (e) {
+            _tz = process.env.N2_TIMEZONE || 'Asia/Seoul';
+        }
+    }
+    return _tz;
+}
 
 // -- Logging --
 
@@ -47,12 +58,12 @@ function writeFile(filePath, content) {
 // -- Time --
 
 function today() {
-    return new Date().toLocaleDateString('sv-SE', { timeZone: _tz });
+    return new Date().toLocaleDateString('sv-SE', { timeZone: _getTimezone() });
 }
 
 function nowISO() {
     const formatter = new Intl.DateTimeFormat('sv-SE', {
-        timeZone: _tz,
+        timeZone: _getTimezone(),
         year: 'numeric', month: '2-digit', day: '2-digit',
         hour: '2-digit', minute: '2-digit', second: '2-digit',
         hour12: false,
@@ -62,7 +73,7 @@ function nowISO() {
     // Compute UTC offset dynamically for the configured timezone
     const now = new Date();
     const utcStr = now.toLocaleString('en-US', { timeZone: 'UTC' });
-    const tzStr = now.toLocaleString('en-US', { timeZone: _tz });
+    const tzStr = now.toLocaleString('en-US', { timeZone: _getTimezone() });
     const diffMs = new Date(tzStr) - new Date(utcStr);
     const diffH = Math.floor(Math.abs(diffMs) / 3600000);
     const diffM = Math.floor((Math.abs(diffMs) % 3600000) / 60000);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "n2-soul",
-    "version": "6.1.3",
+    "version": "6.1.4",
     "description": "Multi-agent session orchestrator with KV-Cache and Ark for MCP (Model Context Protocol)",
     "main": "index.js",
     "scripts": {

package/sequences/boot.js

@@ -1,5 +1,6 @@
-// Soul MCP v6.0 — Boot sequence. Handoff + Entity/Core Memory injection + KV-Cache restore.
+// Soul MCP — Boot sequence. Handoff + Entity/Core Memory injection + KV-Cache restore.
 const path = require('path');
+const pkg = require('../package.json');
 const fs = require('fs');
 const { readJson, today, nowISO, logError } = require('../lib/utils');
 const { detectAgentsDir, listAgents } = require('../lib/agent-registry');
@@ -32,7 +33,7 @@ function registerBootSequence(server, z, config) {
             const agentName = agent || process.env.N2_AGENT_NAME || 'default';
             setAgentName(agentName);
 
-            lines.push(`--- Soul Boot v6.0 | ${agentName} | ${today()} ---`);
+            lines.push(`--- Soul Boot v${pkg.version} | ${agentName} | ${today()} ---`);
             if (agents.length > 0) {
                 lines.push(`Agents: ${agents.map(a => `${a.name}[${a.model}]`).join(', ')}`);
             }
@@ -114,7 +115,7 @@ function registerBootSequence(server, z, config) {
                 lines.push(`⚠️ Core Memory: ${e.message}`);
             }
 
-            lines.push(`\n--- Soul Boot v6.0 complete ---`);
+            lines.push(`\n--- Soul Boot v${pkg.version} complete ---`);
             return { content: [{ type: 'text', text: lines.join('\n') }] };
         }
     );

package/sequences/end.js

@@ -66,8 +66,8 @@ function registerEndSequence(server, z, config) {
                 for (const d of allDecisions) {
                     board.decisions.push({ date: dateStr, by: agent, what: d, why: '' });
                 }
-                if (board.decisions.length > 20) {
-                    board.decisions = board.decisions.slice(-20);
+                if (board.decisions.length > (config.WORK?.maxDecisions ?? 20)) {
+                    board.decisions = board.decisions.slice(-(config.WORK?.maxDecisions ?? 20));
                 }
 
                 board.updatedBy = agent;

package/sequences/work.js

@@ -7,8 +7,8 @@ const { SoulEngine } = require('../lib/soul-engine');
 // In-memory work session state per project
 const activeSessions = {};
 
-// TTL: auto-expire stale sessions (24 hours, checked every hour)
-const SESSION_TTL_MS = 24 * 60 * 60 * 1000;
+// TTL: auto-expire stale sessions (checked every hour)
+const SESSION_TTL_MS = (require('../lib/config').WORK?.sessionTtlHours ?? 24) * 60 * 60 * 1000;
 const _sessionGcTimer = setInterval(() => {
     const now = Date.now();
     for (const [project, session] of Object.entries(activeSessions)) {

package/tests/test-simulation.js

@@ -0,0 +1,153 @@
+// Soul 통합 시뮬레이션 — 수정된 모듈들이 실제로 정상 동작하는지 확인
+const path = require('path');
+const assert = (cond, msg) => {
+    if (cond) { console.log(`  ✅ ${msg}`); pass++; }
+    else { console.error(`  ❌ ${msg}`); fail++; }
+};
+let pass = 0, fail = 0;
+
+// ═══════════════════════════════════════
+// 1. 버전 동적 로드 확인 (#1, #2)
+// ═══════════════════════════════════════
+console.log('\n[1] 버전 동적 로드');
+const pkg = require('../package.json');
+assert(pkg.version === '6.1.3', `package.json version: ${pkg.version}`);
+// boot.js에서 어떻게 사용하는지 검증
+const bootPkg = require('../package.json');
+assert(bootPkg.version === pkg.version, `boot.js도 같은 버전 참조: ${bootPkg.version}`);
+
+// ═══════════════════════════════════════
+// 2. Config 로드 + deepMerge (#3, #8, #13)
+// ═══════════════════════════════════════
+console.log('\n[2] Config 로드 & 새 설정 확인');
+const config = require('../lib/config');
+assert(config.TIMEZONE === 'Asia/Seoul', `TIMEZONE: ${config.TIMEZONE}`);
+assert(config.WORK !== undefined, 'WORK 섹션 존재');
+assert(config.WORK.sessionTtlHours === 24, `sessionTtlHours: ${config.WORK.sessionTtlHours}`);
+assert(config.WORK.maxDecisions === 20, `maxDecisions: ${config.WORK.maxDecisions}`);
+assert(config.ARK.auditMaxAgeDays === 7, `auditMaxAgeDays: ${config.ARK.auditMaxAgeDays}`);
+
+// ═══════════════════════════════════════
+// 3. Timezone — config.TIMEZONE 반영 확인 (#3)
+// ═══════════════════════════════════════
+console.log('\n[3] Timezone 함수');
+const { today, nowISO } = require('../lib/utils');
+const todayStr = today();
+assert(/^\d{4}-\d{2}-\d{2}$/.test(todayStr), `today(): ${todayStr}`);
+const nowStr = nowISO();
+assert(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{2}:\d{2}$/.test(nowStr), `nowISO(): ${nowStr}`);
+assert(nowStr.endsWith('+09:00'), `Timezone 반영 (Asia/Seoul +09:00): ${nowStr.slice(-6)}`);
+
+// ═══════════════════════════════════════
+// 4. Paths — DATA_DIR 우선 참조 확인 (#4)
+// ═══════════════════════════════════════
+console.log('\n[4] Paths 모듈');
+const { PROJECT_ROOT, getAgentsDir } = require('../lib/paths');
+const agentsDir = getAgentsDir();
+assert(agentsDir.includes('data'), `getAgentsDir(): ${agentsDir}`);
+assert(PROJECT_ROOT === path.resolve(__dirname, '..', '..'), `PROJECT_ROOT: ${PROJECT_ROOT}`);
+
+// ═══════════════════════════════════════
+// 5. Ark — createArk + ?? + auditMaxAgeDays (#7, #8)
+// ═══════════════════════════════════════
+console.log('\n[5] Ark 로드 & strictMode ?? 검증');
+const { createArk } = require('../lib/ark');
+const ark = createArk({
+    rulesDir: path.join(__dirname, '..', 'rules'),
+    auditDir: path.join(config.DATA_DIR, 'ark-audit'),
+    strictMode: false,   // 명시적 false — || 였으면 fallback 됐을 것
+    auditMaxAgeDays: 14, // #8: config에서 전달 가능
+    auditEnabled: false, // 테스트이므로 감사 비활성
+});
+const summary = ark.summary();
+assert(summary.blacklists > 0, `Blacklist 규칙: ${summary.blacklists} (${summary.patterns} patterns)`);
+assert(summary.gates > 0, `Gate 규칙: ${summary.gates}`);
+
+// strictMode=false일 때 unknown 도구 허용 확인
+const unknownResult = ark.check('some_unknown_tool', '{}', 'tool_call');
+assert(unknownResult.allowed === true, 'strictMode=false: unknown tool 허용');
+
+// 차단 확인
+const blockResult = ark.check('run_command', 'rm -rf /', 'tool_call');
+assert(blockResult.allowed === false, `rm -rf / 차단: ${blockResult.rule}`);
+
+// 2차 실행 공격 차단
+const scriptResult = ark.check('run_command', 'bash exploit.sh', 'tool_call');
+assert(scriptResult.allowed === false, `bash *.sh 차단: ${scriptResult.rule}`);
+
+// ═══════════════════════════════════════
+// 6. Parser — @gate brace counting 검증 (#9)
+// ═══════════════════════════════════════
+console.log('\n[6] @gate 파서 brace counting');
+const { parse } = require('../lib/ark/parser');
+const testRule = `
+@gate complex_gate {
+    actions: [deploy, publish]
+    requires: human_approval
+    min_approval_level: 2
+}
+`;
+const parsed = parse(testRule);
+assert(parsed.gates.complex_gate !== undefined, 'complex_gate 파싱 성공');
+assert(parsed.gates.complex_gate.actions.length === 2, `actions: ${parsed.gates.complex_gate.actions}`);
+assert(parsed.gates.complex_gate.minApproval === 2, `minApproval: ${parsed.gates.complex_gate.minApproval}`);
+
+// ═══════════════════════════════════════
+// 7. SoulEngine — Board/Ledger 기본 동작
+// ═══════════════════════════════════════
+console.log('\n[7] SoulEngine 기본 동작');
+const { SoulEngine } = require('../lib/soul-engine');
+const engine = new SoulEngine(config.DATA_DIR);
+const board = engine.readBoard('__test_sim__');
+assert(board.project === '__test_sim__', `readBoard: project=${board.project}`);
+
+// ═══════════════════════════════════════
+// 8. CoreMemory + EntityMemory
+// ═══════════════════════════════════════
+console.log('\n[8] Memory 모듈');
+const { CoreMemory } = require('../lib/core-memory');
+const { EntityMemory } = require('../lib/entity-memory');
+const coreMem = new CoreMemory(config.DATA_DIR);
+const coreData = coreMem.read('__test_agent__');
+assert(coreData.agent === '__test_agent__', 'CoreMemory read OK');
+
+const entityMem = new EntityMemory(config.DATA_DIR);
+const entityResult = entityMem.search('test');
+assert(Array.isArray(entityResult), 'EntityMemory search OK');
+
+// ═══════════════════════════════════════
+// 9. KV-Cache 로드 시뮬레이션
+// ═══════════════════════════════════════
+console.log('\n[9] KV-Cache 초기화');
+const { SoulKVCache } = require('../lib/kv-cache');
+const kvCache = new SoulKVCache(config.DATA_DIR, config.KV_CACHE);
+const loadResult = kvCache.load('__test_sim__');
+assert(loadResult === null || typeof loadResult === 'object', 'KV-Cache load: OK (null or object)');
+const snapList = kvCache.listSnapshots('__test_sim__');
+assert(Array.isArray(snapList), `KV-Cache list: ${snapList.length} snapshots`);
+
+// ═══════════════════════════════════════
+// 10. intercom-log — config.DATA_DIR 참조 (#5)
+// ═══════════════════════════════════════
+console.log('\n[10] intercom-log config 호환성');
+const { normalizeName, getValidAgentNames } = require('../lib/intercom-log');
+const agents = getValidAgentNames();
+assert(agents.has('master'), 'Default agent "master" 존재');
+const normalized = normalizeName('UNKNOWN_PERSON');
+assert(normalized === 'master', `Unknown name → master: "${normalized}"`);
+
+// ═══════════════════════════════════════
+// 결과
+// ═══════════════════════════════════════
+console.log(`\n${'='.repeat(40)}`);
+console.log(`=== SIMULATION: ${pass}/${pass + fail} passed ===`);
+if (fail > 0) {
+    console.log(`⚠️ ${fail} FAILED`);
+    process.exit(1);
+} else {
+    console.log('🎉 All checks passed!');
+}
+
+// Cleanup: close ark audit to prevent hang
+ark.close();
+kvCache.stopAutoBackup();