@hanhnd/agent-kit 1.0.32 → 1.0.34

package/dist/{tools/handoffs.js → core/handoffs/index.js}

@@ -7,12 +7,13 @@ export const HANDOFF_TYPES = [
     'research',
     'scenario',
     'investigation',
+    'code',
 ];
 const TICKET_ID_PATTERN = /\b[A-Z][A-Z0-9]+-\d+\b/;
 function findTicketId(value) {
     return value.match(TICKET_ID_PATTERN)?.[0].toLowerCase() ?? null;
 }
-export function sanitizeFeatureSlug(value) {
+function sanitizeFeatureSlug(value) {
     return value
         .replace(/[^a-zA-Z0-9-_]/g, '-')
         .replace(/-+/g, '-')
@@ -26,13 +27,13 @@ function contentSlugCandidate(content) {
         .find((line) => line.length > 0);
     return heading ?? content.replace(/\s+/g, ' ').trim().slice(0, 80);
 }
-export function normalizeHandoffType(type) {
+function normalizeHandoffType(type) {
     if (!HANDOFF_TYPES.includes(type)) {
         throw new Error(`Unsupported handoff type: ${type}`);
     }
     return type;
 }
-export function deriveFeatureSlug(input) {
+function deriveFeatureSlug(input) {
     const requestedTicketSlug = findTicketId(input.requestedSlug);
     if (requestedTicketSlug)
         return requestedTicketSlug;
@@ -44,18 +45,25 @@ export function deriveFeatureSlug(input) {
         return contentTicketSlug;
     return sanitizeFeatureSlug(contentSlugCandidate(input.content)) || 'untitled-handoff';
 }
-export function resolveHandoffPath(input) {
+export function resolveHandoffFolder(input) {
     const canonicalType = normalizeHandoffType(input.type);
     const featureSlug = deriveFeatureSlug({
         requestedSlug: input.slug,
-        content: input.content,
+        content: input.primaryContent,
         type: canonicalType,
     });
-    const relativePath = path.join('.agent-kit', 'handoffs', featureSlug, `${canonicalType}.md`);
+    const relativePath = path.join('.agent-kit', 'handoffs', featureSlug, canonicalType);
     return {
         featureSlug,
         canonicalType,
-        filePath: path.join(input.workspaceRoot, relativePath),
+        folderPath: path.join(input.workspaceRoot, relativePath),
         relativePath,
     };
 }
+export function validateHandoffFilename(name) {
+    const normalized = name.trim().replace(/^["']|["']$/g, '');
+    if (!/^[A-Za-z0-9_-]+\.md$/.test(normalized)) {
+        throw new Error(`Unsafe handoff filename: ${name}`);
+    }
+    return normalized;
+}

package/dist/core/handoffs/index.test.js

@@ -0,0 +1,88 @@
+import * as assert from 'node:assert/strict';
+import * as path from 'node:path';
+import { describe, test } from 'node:test';
+import { resolveHandoffFolder, validateHandoffFilename } from './index.js';
+const WORKSPACE = '/tmp/test-workspace';
+describe('resolveHandoffFolder', () => {
+    test('relativePath has no .md suffix', () => {
+        const result = resolveHandoffFolder({
+            workspaceRoot: WORKSPACE,
+            type: 'plan',
+            slug: 'my-feature',
+            primaryContent: '',
+        });
+        assert.ok(!result.relativePath.endsWith('.md'), `relativePath must not end with .md, got: ${result.relativePath}`);
+        assert.equal(result.relativePath, path.join('.agent-kit', 'handoffs', 'my-feature', 'plan'));
+    });
+    test('folderPath is absolute under workspaceRoot', () => {
+        const result = resolveHandoffFolder({
+            workspaceRoot: WORKSPACE,
+            type: 'brainstorm',
+            slug: 'auth',
+            primaryContent: '',
+        });
+        assert.equal(result.folderPath, path.join(WORKSPACE, '.agent-kit', 'handoffs', 'auth', 'brainstorm'));
+    });
+    test('ticket-ID extracted from primaryContent when slug is empty', () => {
+        const result = resolveHandoffFolder({
+            workspaceRoot: WORKSPACE,
+            type: 'plan',
+            slug: '',
+            primaryContent: '# Fix PROJ-456\n\nSome content.',
+        });
+        assert.equal(result.featureSlug, 'proj-456');
+    });
+    test('first-heading fallback when no ticket ID in slug or content', () => {
+        const result = resolveHandoffFolder({
+            workspaceRoot: WORKSPACE,
+            type: 'research',
+            slug: '',
+            primaryContent: '# My Feature\n\nDetail.',
+        });
+        assert.equal(result.featureSlug, 'my-feature');
+    });
+    test('"untitled-handoff" fallback when both slug and content are empty', () => {
+        const result = resolveHandoffFolder({ workspaceRoot: WORKSPACE, type: 'ticket', slug: '', primaryContent: '' });
+        assert.equal(result.featureSlug, 'untitled-handoff');
+    });
+    test('code handoff resolves under code folder', () => {
+        const result = resolveHandoffFolder({
+            workspaceRoot: WORKSPACE,
+            type: 'code',
+            slug: 'execution-decision-ledger',
+            primaryContent: '# Execution Report',
+        });
+        assert.equal(result.canonicalType, 'code');
+        assert.equal(result.relativePath, path.join('.agent-kit', 'handoffs', 'execution-decision-ledger', 'code'));
+        assert.equal(result.folderPath, path.join(WORKSPACE, '.agent-kit', 'handoffs', 'execution-decision-ledger', 'code'));
+    });
+});
+describe('validateHandoffFilename', () => {
+    test('"README.md" returns unchanged', () => {
+        assert.equal(validateHandoffFilename('README.md'), 'README.md');
+    });
+    test('"DETAIL.md" returns unchanged', () => {
+        assert.equal(validateHandoffFilename('DETAIL.md'), 'DETAIL.md');
+    });
+    test('"index.md" returns unchanged', () => {
+        assert.equal(validateHandoffFilename('index.md'), 'index.md');
+    });
+    test('"../etc/passwd" throws', () => {
+        assert.throws(() => validateHandoffFilename('../etc/passwd'), /Unsafe handoff filename/);
+    });
+    test('"sub/dir.md" throws', () => {
+        assert.throws(() => validateHandoffFilename('sub/dir.md'), /Unsafe handoff filename/);
+    });
+    test('"README" throws — missing .md extension', () => {
+        assert.throws(() => validateHandoffFilename('README'), /Unsafe handoff filename/);
+    });
+    test('empty string throws', () => {
+        assert.throws(() => validateHandoffFilename(''), /Unsafe handoff filename/);
+    });
+    test('"README.txt" throws — wrong extension', () => {
+        assert.throws(() => validateHandoffFilename('README.txt'), /Unsafe handoff filename/);
+    });
+    test('".hidden.md" throws — leading dot', () => {
+        assert.throws(() => validateHandoffFilename('.hidden.md'), /Unsafe handoff filename/);
+    });
+});

package/dist/{tools/security.d.ts → core/security/index.d.ts}

@@ -18,26 +18,7 @@ export declare function sanitize(input: string): string;
  * Uses stricter path.sep check to prevent prefix matching flaws.
  */
 export declare function validatePath(filePath: string, baseDir?: string): string;
-/**
- * Safe git command execution using execFileSync
- * Includes stderr in error message for better debugging
- *
- * @param timeout Default from GEMINI_KIT_GIT_TIMEOUT env var or 30s
- */
-export declare function safeGit(args: string[], options?: {
-    timeout?: number;
-    cwd?: string;
-}): string;
-/**
- * Check if a command exists (cross-platform)
- * Uses 'where' on Windows, 'which' on macOS/Linux
- */
 export declare function commandExists(cmd: string): boolean;
-/**
- * Async file finder - non-blocking for large repos
- * Uses queue-based approach to prevent stack overflow on deep directories
- */
-export declare function findFilesAsync(dir: string, extensions: string[], maxFiles: number, excludeDirs?: string[]): Promise<string[]>;
 /**
  * Sanitize output text by redacting sensitive tokens (API keys, etc.)
  */

package/dist/{tools/security.js → core/security/index.js}

@@ -3,10 +3,9 @@
  * Exported utilities for safe command execution
  */
 import { execFileSync } from 'child_process';
-import * as fs from 'fs';
 import * as path from 'path';
-import { getWorkspaceRoot } from '../utils/utils.js';
-import { FORBIDDEN_DIRS, FORBIDDEN_FILES, FORBIDDEN_PATTERNS } from './config.js';
+import { getWorkspaceRoot } from '../../utils/utils.js';
+import { FORBIDDEN_DIRS, FORBIDDEN_FILES, FORBIDDEN_PATTERNS } from '../config/index.js';
 /**
  * Sanitize string for safe use with execFileSync
  * Only removes dangerous shell operators - safe chars like !?#* are allowed
@@ -52,42 +51,6 @@ export function validatePath(filePath, baseDir = process.cwd()) {
     }
     return resolved;
 }
-/**
- * Extract stderr from error for better logging
- */
-function extractStderr(error) {
-    if (error && typeof error === 'object' && 'stderr' in error) {
-        return String(error.stderr);
-    }
-    return '';
-}
-// Configurable timeouts via environment variables
-const GIT_TIMEOUT = parseInt(process.env.GEMINI_KIT_GIT_TIMEOUT || '30000', 10);
-/**
- * Safe git command execution using execFileSync
- * Includes stderr in error message for better debugging
- *
- * @param timeout Default from GEMINI_KIT_GIT_TIMEOUT env var or 30s
- */
-export function safeGit(args, options) {
-    try {
-        return execFileSync('git', args, {
-            encoding: 'utf8',
-            timeout: options?.timeout || GIT_TIMEOUT,
-            cwd: options?.cwd || getWorkspaceRoot(),
-            maxBuffer: 10 * 1024 * 1024, // 10MB
-        });
-    }
-    catch (error) {
-        const stderr = extractStderr(error);
-        const baseMsg = error instanceof Error ? error.message : String(error);
-        throw new Error(`Git command failed: ${baseMsg}${stderr ? `\nDetails: ${stderr}` : ''}`);
-    }
-}
-/**
- * Check if a command exists (cross-platform)
- * Uses 'where' on Windows, 'which' on macOS/Linux
- */
 export function commandExists(cmd) {
     try {
         const checkCmd = process.platform === 'win32' ? 'where' : 'which';
@@ -103,42 +66,6 @@ export function commandExists(cmd) {
         return false;
     }
 }
-/**
- * Async file finder - non-blocking for large repos
- * Uses queue-based approach to prevent stack overflow on deep directories
- */
-export async function findFilesAsync(dir, extensions, maxFiles, excludeDirs = ['node_modules', '.git', 'dist', 'build', 'coverage']) {
-    const results = [];
-    // Use queue instead of recursion to prevent stack overflow
-    const queue = [{ fullPath: dir, relativePath: '' }];
-    while (queue.length > 0 && results.length < maxFiles) {
-        const current = queue.shift();
-        let entries;
-        try {
-            entries = await fs.promises.readdir(current.fullPath, { withFileTypes: true });
-        }
-        catch {
-            continue; // Skip directories we can't read
-        }
-        for (const entry of entries) {
-            if (results.length >= maxFiles)
-                break;
-            const entryFullPath = path.join(current.fullPath, entry.name);
-            const entryRelPath = current.relativePath ? path.join(current.relativePath, entry.name) : entry.name;
-            if (entry.isDirectory()) {
-                if (!excludeDirs.includes(entry.name)) {
-                    queue.push({ fullPath: entryFullPath, relativePath: entryRelPath });
-                }
-            }
-            else if (entry.isFile()) {
-                if (extensions.some((ext) => entry.name.endsWith(ext))) {
-                    results.push(entryRelPath);
-                }
-            }
-        }
-    }
-    return results;
-}
 /**
  * Sanitize output text by redacting sensitive tokens (API keys, etc.)
  */
@@ -148,7 +75,7 @@ export function sanitizeOutput(text) {
         /SK-[A-Za-z0-9]{40,}/g, // OpenAI keys
         /AKIA[0-9A-Z]{16}/g, // AWS access keys
         /xox[baprs]-[A-Za-z0-9-]{10,}/g, // Slack tokens
-        /[Aa]tlassian[_\-]?[Aa][Pp][Ii][_\-]?[Tt]oken[^\s]*\s*[:=]\s*\S+/g, // Atlassian token patterns
+        /[Aa]tlassian[_-]?[Aa][Pp][Ii][_-]?[Tt]oken[^\s]*\s*[:=]\s*\S+/g, // Atlassian token patterns
     ];
     let sanitized = text;
     for (const pattern of SECRET_PATTERNS) {

package/dist/entrypoints/cli.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import { runAgentKitCli } from '../cli/index.js';
+try {
+    const exitCode = await runAgentKitCli(process.argv.slice(2), process.env);
+    process.exit(exitCode);
+}
+catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    process.stderr.write('[agent-kit] CLI error: ' + message + '\n');
+    process.exit(1);
+}

package/dist/entrypoints/server.js

@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+/**
+ * Agent-Kit MCP Server
+ * Provides custom tools for agent orchestration
+ *
+ * Modular architecture - tools split into separate modules
+ */
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { registerCoreTools } from '../mcp/core.js';
+import { registerAgentTools } from '../mcp/agent.js';
+import { registerIntegrationTools } from '../mcp/integration.js';
+import { loadProjectSettings } from '../core/config/index.js';
+import { registerMemoryTools } from '../mcp/memory.js';
+import { getWorkspaceRoot } from '../utils/utils.js';
+const server = new McpServer({
+    name: 'kit-agents',
+    version: '1.0.0',
+});
+// ═══════════════════════════════════════════════════════════════
+// REGISTER MODULAR TOOLS
+// ═══════════════════════════════════════════════════════════════
+registerIntegrationTools(server);
+registerCoreTools(server);
+registerAgentTools(server);
+const workspaceRoot = getWorkspaceRoot();
+const settings = loadProjectSettings(workspaceRoot);
+const memoryIndexer = registerMemoryTools(server, settings, workspaceRoot);
+// ═══════════════════════════════════════════════════════════════
+// START SERVER
+// ═══════════════════════════════════════════════════════════════
+const transport = new StdioServerTransport();
+await server.connect(transport);
+// Fire-and-forget startup indexing — must run after server.connect
+if (memoryIndexer) {
+    void memoryIndexer.startupIndex();
+}

package/dist/{tools → mcp}/agent.d.ts

@@ -1,6 +1,6 @@
 /**
  * Agent Delegation Tools - Invoke external agent CLIs (Gemini, Claude, Codex)
- * Supports handoff file injection and automatic fallback
+ * Supports handoff folder references and automatic fallback
  */
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 export declare function registerAgentTools(server: McpServer): void;

package/dist/{tools → mcp}/agent.js

@@ -1,6 +1,6 @@
 /**
  * Agent Delegation Tools - Invoke external agent CLIs (Gemini, Claude, Codex)
- * Supports handoff file injection and automatic fallback
+ * Supports handoff folder references and automatic fallback
  */
 import { spawn } from 'child_process';
 import { randomUUID } from 'crypto';
@@ -8,7 +8,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { z } from 'zod';
 import { getWorkspaceRoot, mcpJson, mcpText } from '../utils/utils.js';
-import { commandExists, sanitizeOutput, validatePath } from './security.js';
+import { commandExists, sanitizeOutput, validatePath } from '../core/security/index.js';
 // Configurable timeout via environment variable (default: 5 minutes)
 const AGENT_TIMEOUT = parseInt(process.env.KIT_AGENT_TIMEOUT || '300000', 10);
 const jobRegistry = new Map();
@@ -49,11 +49,11 @@ function initAgentLog(workspaceRoot, slug, agent) {
     return { logPath: path.relative(workspaceRoot, logFile), logStream };
 }
 export function registerAgentTools(server) {
-    server.tool('kit_trigger_agent', '!Important: Trigger only when user explicitly asks to delegate a task to an external agent CLI (gemini, claude, or codex). The task can be a direct message or a path to a handoff file (.agent-kit/handoffs/feature-slug/plan.md).', {
+    server.tool('kit_trigger_agent', '!Important: Trigger only when user explicitly asks to delegate a task to an external agent CLI (gemini, claude, or codex). The task can be a direct message or a path to a handoff folder (.agent-kit/handoffs/feature-slug/plan).', {
         agent: z.enum(['gemini', 'claude', 'codex']).describe('The agent CLI to invoke: "gemini", "claude", or "codex"'),
         task: z
             .string()
-            .describe('Task message or path to a handoff file (e.g., ".agent-kit/handoffs/feature-slug/plan.md")'),
+            .describe('Task message or path to a handoff folder (e.g., ".agent-kit/handoffs/feature-slug/plan")'),
     }, async ({ agent, task }, extra) => {
         const workspaceRoot = getWorkspaceRoot();
         let job;

package/dist/mcp/core.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Core Tools - Extension info and handoff persistence
+ */
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { mcpText } from '../utils/utils.js';
+import { DEFAULT_EXTENSIONS } from '../core/config/index.js';
+import { HANDOFF_TYPES } from '../core/handoffs/index.js';
+export declare function handleSaveHandoff(args: {
+    type: (typeof HANDOFF_TYPES)[number];
+    slug: string;
+    files: Record<string, string>;
+}, workspaceRoot: string): ReturnType<typeof mcpText>;
+/**
+ * Register core tools with MCP server
+ */
+export declare function registerCoreTools(server: McpServer): void;
+export { DEFAULT_EXTENSIONS };

package/dist/mcp/core.js

@@ -0,0 +1,60 @@
+/**
+ * Core Tools - Extension info and handoff persistence
+ */
+import * as fs from 'fs';
+import * as path from 'path';
+import { z } from 'zod';
+import { getWorkspaceRoot, mcpText } from '../utils/utils.js';
+import { DEFAULT_EXTENSIONS } from '../core/config/index.js';
+import { HANDOFF_TYPES, resolveHandoffFolder, validateHandoffFilename } from '../core/handoffs/index.js';
+export function handleSaveHandoff(args, workspaceRoot) {
+    try {
+        if (Object.keys(args.files).length === 0) {
+            return mcpText('Error saving handoff: files cannot be empty');
+        }
+        for (const name of Object.keys(args.files)) {
+            try {
+                validateHandoffFilename(name);
+            }
+            catch (err) {
+                return mcpText(`Error saving handoff: ${err instanceof Error ? err.message : err}`);
+            }
+        }
+        const primaryContent = args.files['README.md'] ?? Object.values(args.files)[0];
+        const location = resolveHandoffFolder({
+            workspaceRoot,
+            type: args.type,
+            slug: args.slug,
+            primaryContent,
+        });
+        fs.mkdirSync(location.folderPath, { recursive: true });
+        for (const [name, content] of Object.entries(args.files)) {
+            fs.writeFileSync(path.join(location.folderPath, name), content, 'utf8');
+        }
+        return mcpText(`✅ Saved to: ${location.folderPath}`);
+    }
+    catch (error) {
+        return mcpText(`Error saving handoff: ${error instanceof Error ? error.message : error}`);
+    }
+}
+/**
+ * Register core tools with MCP server
+ */
+export function registerCoreTools(server) {
+    // ═══════════════════════════════════════════════════════════════
+    // TOOL: SAVE HANDOFF
+    // Writes handoff artifacts to the workspace as a folder of files
+    // Returns the saved folder path to use in next-step instructions
+    // ═══════════════════════════════════════════════════════════════
+    server.tool('kit_save_handoff', `Save a handoff artifact to .agent-kit/handoffs/. Returns the saved folder path to use in next-step instructions. Do NOT append version numbers (v2, v3, etc.) to the slug.`, {
+        type: z.enum(HANDOFF_TYPES).describe('Handoff type'),
+        files: z
+            .record(z.string(), z.string())
+            .describe('Markdown files to write into the handoff folder. May include one or many files per call; repeated calls with the same type and slug add or overwrite the provided files. Filenames must match /^[A-Za-z0-9_-]+\\.md$/.'),
+        slug: z
+            .string()
+            .describe('Short identifier for the folder, e.g. "user-auth" or "PROJ-123". Do NOT append version numbers (v2, v3, etc.).'),
+    }, async (args) => handleSaveHandoff(args, getWorkspaceRoot()));
+}
+// Export DEFAULT_EXTENSIONS for backward compatibility
+export { DEFAULT_EXTENSIONS };

package/dist/mcp/core.test.js

@@ -0,0 +1,98 @@
+import * as assert from 'node:assert/strict';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { afterEach, describe, test } from 'node:test';
+import { handleSaveHandoff } from './core.js';
+const tempDirs = [];
+function makeTempWorkspace() {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'core-test-'));
+    tempDirs.push(dir);
+    return dir;
+}
+afterEach(() => {
+    while (tempDirs.length > 0) {
+        const dir = tempDirs.pop();
+        if (dir)
+            fs.rmSync(dir, { recursive: true, force: true });
+    }
+});
+function resultText(result) {
+    return result.content[0].text;
+}
+describe('handleSaveHandoff', () => {
+    test('C1: README.md + DETAIL.md written under folder; returns folder path without .md', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'brainstorm', slug: 'auth', files: { 'README.md': '# Readme', 'DETAIL.md': '# Detail' } }, workspace);
+        const text = resultText(result);
+        assert.ok(text.startsWith('✅ Saved to:'), `expected success, got: ${text}`);
+        assert.ok(!text.endsWith('.md'), 'folder path must not end with .md');
+        const folderPath = text.replace('✅ Saved to: ', '');
+        assert.ok(fs.existsSync(path.join(folderPath, 'README.md')), 'README.md must exist');
+        assert.ok(fs.existsSync(path.join(folderPath, 'DETAIL.md')), 'DETAIL.md must exist');
+        assert.equal(fs.readFileSync(path.join(folderPath, 'README.md'), 'utf8'), '# Readme');
+        assert.equal(fs.readFileSync(path.join(folderPath, 'DETAIL.md'), 'utf8'), '# Detail');
+    });
+    test('C2: single README.md written under folder; returns folder path', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'ticket', slug: 'my-ticket', files: { 'README.md': '# Ticket content' } }, workspace);
+        const text = resultText(result);
+        assert.ok(text.startsWith('✅ Saved to:'), `expected success, got: ${text}`);
+        const folderPath = text.replace('✅ Saved to: ', '');
+        assert.ok(!text.endsWith('.md'), 'folder path must not end with .md');
+        assert.ok(fs.existsSync(path.join(folderPath, 'README.md')), 'README.md must exist');
+        assert.equal(fs.readFileSync(path.join(folderPath, 'README.md'), 'utf8'), '# Ticket content');
+    });
+    test('C3: empty files returns error containing "files cannot be empty"', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'plan', slug: 'x', files: {} }, workspace);
+        assert.match(resultText(result), /files cannot be empty/);
+    });
+    test('C4: path-traversal filename returns error containing "Unsafe handoff filename"', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'plan', slug: 'x', files: { '../escape.md': 'bad' } }, workspace);
+        assert.match(resultText(result), /Unsafe handoff filename/);
+    });
+    test('C5: filename without .md extension returns error containing "Unsafe handoff filename"', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'plan', slug: 'x', files: { README: 'bad' } }, workspace);
+        assert.match(resultText(result), /Unsafe handoff filename/);
+    });
+    test('C6: slug derived from README.md content ticket-ID when slug is empty', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({ type: 'brainstorm', slug: '', files: { 'README.md': '# Fix PROJ-789\n\nDetails.' } }, workspace);
+        const text = resultText(result);
+        assert.ok(text.includes('proj-789'), `expected proj-789 in path, got: ${text}`);
+    });
+    test('C7: second call with same slug overwrites files without error (idempotent)', () => {
+        const workspace = makeTempWorkspace();
+        const args = { type: 'plan', slug: 'idem', files: { 'README.md': 'v1' } };
+        const r1 = handleSaveHandoff(args, workspace);
+        assert.ok(resultText(r1).startsWith('✅'), `first call failed: ${resultText(r1)}`);
+        const argsV2 = { type: 'plan', slug: 'idem', files: { 'README.md': 'v2' } };
+        const r2 = handleSaveHandoff(argsV2, workspace);
+        assert.ok(resultText(r2).startsWith('✅'), `second call failed: ${resultText(r2)}`);
+        const folderPath = resultText(r2).replace('✅ Saved to: ', '');
+        assert.equal(fs.readFileSync(path.join(folderPath, 'README.md'), 'utf8'), 'v2');
+    });
+    test('C8: code handoff writes REPORT.md and DECISIONS.md without README.md', () => {
+        const workspace = makeTempWorkspace();
+        const result = handleSaveHandoff({
+            type: 'code',
+            slug: 'execution-decision-ledger',
+            files: {
+                'REPORT.md': '# Code Execution Report',
+                'DECISIONS.md': '# Execution Decision Records',
+            },
+        }, workspace);
+        const text = resultText(result);
+        assert.ok(text.startsWith('✅ Saved to:'), `expected success, got: ${text}`);
+        const folderPath = text.replace('✅ Saved to: ', '');
+        assert.equal(folderPath, path.join(workspace, '.agent-kit', 'handoffs', 'execution-decision-ledger', 'code'));
+        assert.ok(fs.existsSync(path.join(folderPath, 'REPORT.md')), 'REPORT.md must exist');
+        assert.ok(fs.existsSync(path.join(folderPath, 'DECISIONS.md')), 'DECISIONS.md must exist');
+        assert.equal(fs.existsSync(path.join(folderPath, 'README.md')), false);
+        assert.equal(fs.readFileSync(path.join(folderPath, 'REPORT.md'), 'utf8'), '# Code Execution Report');
+        assert.equal(fs.readFileSync(path.join(folderPath, 'DECISIONS.md'), 'utf8'), '# Execution Decision Records');
+    });
+});

package/dist/{tools → mcp}/integration.js

@@ -4,10 +4,10 @@
  */
 import { writeFileSync } from 'fs';
 import { z } from 'zod';
-import { getCredential } from '../utils/credentials.js';
+import { getCredential } from '../services/integration/credentials.js';
 import { mcpText } from '../utils/utils.js';
-import { adfToMarkdown } from '../utils/parser.js';
-import { sanitize } from './security.js';
+import { adfToMarkdown } from '../services/integration/parser/adf.js';
+import { sanitize } from '../core/security/index.js';
 // Zod schema for Bitbucket PR REST API response
 const BitbucketPrSchema = z.object({
     id: z.number(),

package/dist/mcp/memory.d.ts

@@ -0,0 +1,15 @@
+import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { MemoryIndexer } from '../services/memory/indexer.js';
+import { MemoryStore } from '../services/memory/store.js';
+import type { MemoryConfig } from '../services/memory/types.js';
+import { type ProjectSettings } from '../core/config/index.js';
+/**
+ * Initializes the memory subsystem and registers all memory tools.
+ * Returns the MemoryIndexer so the caller can fire startupIndex() after server.connect().
+ * Returns null when memory is disabled (settings.memory.enabled !== true).
+ */
+export declare function registerMemoryTools(server: McpServer, settings: ProjectSettings, workspaceRoot: string, overrides?: {
+    indexer?: MemoryIndexer;
+    store?: MemoryStore;
+    config?: MemoryConfig;
+}): MemoryIndexer | null;

package/dist/{tools → mcp}/memory.js

@@ -1,17 +1,16 @@
 import * as path from 'path';
 import { z } from 'zod';
-import { Embedder } from '../memory/embedder.js';
-import { MemoryIndexer } from '../memory/indexer.js';
-import { MemoryStore } from '../memory/store.js';
-import { initializeConversationDigestModel } from '../memory/digest/processor.js';
-import { DEFAULT_DIGEST_MODEL_ID } from '../memory/digest/constants.js';
+import { Embedder } from '../services/memory/embedder.js';
+import { MemoryIndexer } from '../services/memory/indexer.js';
+import { MemoryStore } from '../services/memory/store.js';
+import { initializeConversationDigestModel } from '../services/digest/processor.js';
+import { DEFAULT_DIGEST_MODEL_ID } from '../services/digest/constants.js';
 import { mcpJson, mcpText } from '../utils/utils.js';
-import { loadProjectSettings, resolveConversationDigestConfig, resolveMemoryConfig, } from './config.js';
+import { loadProjectSettings, resolveConversationDigestConfig, resolveMemoryConfig, } from '../core/config/index.js';
 /**
  * Registers tool handlers onto an already-constructed indexer/store pair.
- * Exported for unit testing with mocks.
  */
-export function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoot = process.cwd()) {
+function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoot = process.cwd()) {
     server.tool('kit_memory_search', 'Search persistent memory for context relevant to the current question. Returns semantically relevant results using hybrid dense+BM25+RRF search.', {
         query: z.string().min(1).describe('Search query'),
         top_k: z.number().int().positive().optional().describe('Number of results to return'),
@@ -89,13 +88,16 @@ export function registerMemoryToolHandlers(server, indexer, store, config, works
  * Returns the MemoryIndexer so the caller can fire startupIndex() after server.connect().
  * Returns null when memory is disabled (settings.memory.enabled !== true).
  */
-export function registerMemoryTools(server, settings, workspaceRoot) {
+export function registerMemoryTools(server, settings, workspaceRoot, overrides) {
     if (settings.memory?.enabled !== true)
         return null;
-    const config = resolveMemoryConfig(settings, workspaceRoot);
-    const store = new MemoryStore(path.join(config.wikiDir, 'index.db'), config);
-    const embedder = new Embedder(config.embeddingModel);
-    const indexer = new MemoryIndexer(store, embedder, config);
+    const config = overrides?.config ?? resolveMemoryConfig(settings, workspaceRoot);
+    const store = overrides?.store ?? new MemoryStore(path.join(config.wikiDir, 'index.db'), config);
+    const indexer = overrides?.indexer ??
+        (() => {
+            const embedder = new Embedder(config.embeddingModel);
+            return new MemoryIndexer(store, embedder, config);
+        })();
     registerMemoryToolHandlers(server, indexer, store, config, workspaceRoot);
     return indexer;
 }