Files
Regolith/skills-engine/apply.ts
gavrielc 51788de3b9 Skills engine v0.1 + multi-channel infrastructure (#307)
* refactor: multi-channel infrastructure with explicit channel/is_group tracking

- Add channels[] array and findChannel() routing in index.ts, replacing
  hardcoded whatsapp.* calls with channel-agnostic callbacks
- Add channel TEXT and is_group INTEGER columns to chats table with
  COALESCE upsert to protect existing values from null overwrites
- is_group defaults to 0 (safe: unknown chats excluded from groups)
- WhatsApp passes explicit channel='whatsapp' and isGroup to onChatMetadata
- getAvailableGroups filters on is_group instead of JID pattern matching
- findChannel logs warnings instead of silently dropping unroutable JIDs
- Migration backfills channel/is_group from JID patterns for existing DBs

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: skills engine v0.1 — deterministic skill packages with rerere resolution

Three-way merge engine for applying skill packages on top of a core
codebase. Skills declare which files they add/modify, and the engine
uses git merge-file for conflict detection with git rerere for
automatic resolution of previously-seen conflicts.

Key components:
- apply: three-way merge with backup/rollback safety net
- replay: clean-slate replay for uninstall and rebase
- update: core version updates with deletion detection
- rebase: bake applied skills into base (one-way)
- manifest: validation with path traversal protection
- resolution-cache: pre-computed rerere resolutions
- structured: npm deps, env vars, docker-compose merging
- CI: per-skill test matrix with conflict detection

151 unit tests covering merge, rerere, backup, replay, uninstall,
update, rebase, structured ops, and edge cases.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* feat: add Discord and Telegram skill packages

Skill packages for adding Discord and Telegram channels to NanoClaw.
Each package includes:
- Channel implementation (add/src/channels/)
- Three-way merge targets for index.ts, config.ts, routing.test.ts
- Intent docs explaining merge invariants
- Standalone integration tests
- manifest.yaml with dependency/conflict declarations

Applied via: npx tsx scripts/apply-skill.ts .claude/skills/add-discord
These are inert until applied — no runtime impact.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* remove unused docs (skills-system-status, implementation-guide)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-02-19 01:55:00 +02:00

398 lines
13 KiB
TypeScript

import { execFileSync, execSync } from 'child_process';
import crypto from 'crypto';
import fs from 'fs';
import os from 'os';
import path from 'path';
import { clearBackup, createBackup, restoreBackup } from './backup.js';
import { NANOCLAW_DIR } from './constants.js';
import { copyDir } from './fs-utils.js';
import { isCustomizeActive } from './customize.js';
import { executeFileOps } from './file-ops.js';
import { acquireLock } from './lock.js';
import {
checkConflicts,
checkCoreVersion,
checkDependencies,
checkSystemVersion,
readManifest,
} from './manifest.js';
import { loadPathRemap, resolvePathRemap } from './path-remap.js';
import {
cleanupMergeState,
isGitRepo,
mergeFile,
runRerere,
setupRerereAdapter,
} from './merge.js';
import { loadResolutions } from './resolution-cache.js';
import { computeFileHash, readState, recordSkillApplication, writeState } from './state.js';
import {
mergeDockerComposeServices,
mergeEnvAdditions,
mergeNpmDependencies,
runNpmInstall,
} from './structured.js';
import { ApplyResult } from './types.js';
export async function applySkill(skillDir: string): Promise<ApplyResult> {
const projectRoot = process.cwd();
const manifest = readManifest(skillDir);
// --- Pre-flight checks ---
const currentState = readState(); // Validates state exists and version is compatible
// Check skills system version compatibility
const sysCheck = checkSystemVersion(manifest);
if (!sysCheck.ok) {
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: sysCheck.error,
};
}
// Check core version compatibility
const coreCheck = checkCoreVersion(manifest);
if (coreCheck.warning) {
console.log(`Warning: ${coreCheck.warning}`);
}
// Block if customize session is active
if (isCustomizeActive()) {
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error:
'A customize session is active. Run commitCustomize() or abortCustomize() first.',
};
}
const deps = checkDependencies(manifest);
if (!deps.ok) {
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: `Missing dependencies: ${deps.missing.join(', ')}`,
};
}
const conflicts = checkConflicts(manifest);
if (!conflicts.ok) {
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: `Conflicting skills: ${conflicts.conflicting.join(', ')}`,
};
}
// Load path remap for renamed core files
const pathRemap = loadPathRemap();
// Detect drift for modified files
const driftFiles: string[] = [];
for (const relPath of manifest.modifies) {
const resolvedPath = resolvePathRemap(relPath, pathRemap);
const currentPath = path.join(projectRoot, resolvedPath);
const basePath = path.join(projectRoot, NANOCLAW_DIR, 'base', resolvedPath);
if (fs.existsSync(currentPath) && fs.existsSync(basePath)) {
const currentHash = computeFileHash(currentPath);
const baseHash = computeFileHash(basePath);
if (currentHash !== baseHash) {
driftFiles.push(relPath);
}
}
}
if (driftFiles.length > 0) {
console.log(`Drift detected in: ${driftFiles.join(', ')}`);
console.log('Three-way merge will be used to reconcile changes.');
}
// --- Acquire lock ---
const releaseLock = acquireLock();
// Track added files so we can remove them on rollback
const addedFiles: string[] = [];
try {
// --- Backup ---
const filesToBackup = [
...manifest.modifies.map((f) => path.join(projectRoot, resolvePathRemap(f, pathRemap))),
...manifest.adds.map((f) => path.join(projectRoot, resolvePathRemap(f, pathRemap))),
...(manifest.file_ops || [])
.filter((op) => op.from)
.map((op) => path.join(projectRoot, resolvePathRemap(op.from!, pathRemap))),
path.join(projectRoot, 'package.json'),
path.join(projectRoot, 'package-lock.json'),
path.join(projectRoot, '.env.example'),
path.join(projectRoot, 'docker-compose.yml'),
];
createBackup(filesToBackup);
// --- File operations (before copy adds, per architecture doc) ---
if (manifest.file_ops && manifest.file_ops.length > 0) {
const fileOpsResult = executeFileOps(manifest.file_ops, projectRoot);
if (!fileOpsResult.success) {
restoreBackup();
clearBackup();
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: `File operations failed: ${fileOpsResult.errors.join('; ')}`,
};
}
}
// --- Copy new files from add/ ---
const addDir = path.join(skillDir, 'add');
if (fs.existsSync(addDir)) {
for (const relPath of manifest.adds) {
const resolvedDest = resolvePathRemap(relPath, pathRemap);
const destPath = path.join(projectRoot, resolvedDest);
if (!fs.existsSync(destPath)) {
addedFiles.push(destPath);
}
// Copy individual file with remap (can't use copyDir when paths differ)
const srcPath = path.join(addDir, relPath);
if (fs.existsSync(srcPath)) {
fs.mkdirSync(path.dirname(destPath), { recursive: true });
fs.copyFileSync(srcPath, destPath);
}
}
}
// --- Merge modified files ---
const mergeConflicts: string[] = [];
// Load pre-computed resolutions into git's rr-cache before merging
const appliedSkillNames = currentState.applied_skills.map((s) => s.name);
loadResolutions([...appliedSkillNames, manifest.skill], projectRoot, skillDir);
for (const relPath of manifest.modifies) {
const resolvedPath = resolvePathRemap(relPath, pathRemap);
const currentPath = path.join(projectRoot, resolvedPath);
const basePath = path.join(projectRoot, NANOCLAW_DIR, 'base', resolvedPath);
// skillPath uses original relPath — skill packages are never mutated
const skillPath = path.join(skillDir, 'modify', relPath);
if (!fs.existsSync(skillPath)) {
throw new Error(`Skill modified file not found: ${skillPath}`);
}
if (!fs.existsSync(currentPath)) {
// File doesn't exist yet — just copy from skill
fs.mkdirSync(path.dirname(currentPath), { recursive: true });
fs.copyFileSync(skillPath, currentPath);
continue;
}
if (!fs.existsSync(basePath)) {
// No base — use current as base (first-time apply)
fs.mkdirSync(path.dirname(basePath), { recursive: true });
fs.copyFileSync(currentPath, basePath);
}
// Three-way merge: current ← base → skill
// Save current content before merge overwrites it (needed for rerere stage 2 = "ours")
const oursContent = fs.readFileSync(currentPath, 'utf-8');
// git merge-file modifies the first argument in-place, so use a temp copy
const tmpCurrent = path.join(
os.tmpdir(),
`nanoclaw-merge-${crypto.randomUUID()}-${path.basename(relPath)}`,
);
fs.copyFileSync(currentPath, tmpCurrent);
const result = mergeFile(tmpCurrent, basePath, skillPath);
if (result.clean) {
fs.copyFileSync(tmpCurrent, currentPath);
fs.unlinkSync(tmpCurrent);
} else {
// Copy conflict markers to working tree path BEFORE rerere
// rerere looks at the working tree file at relPath, not at tmpCurrent
fs.copyFileSync(tmpCurrent, currentPath);
fs.unlinkSync(tmpCurrent);
if (isGitRepo()) {
const baseContent = fs.readFileSync(basePath, 'utf-8');
const theirsContent = fs.readFileSync(skillPath, 'utf-8');
setupRerereAdapter(resolvedPath, baseContent, oursContent, theirsContent);
const autoResolved = runRerere(currentPath);
if (autoResolved) {
// rerere resolved the conflict — currentPath now has resolved content
// Record the resolution: git add + git rerere
execFileSync('git', ['add', resolvedPath], { stdio: 'pipe' });
execSync('git rerere', { stdio: 'pipe' });
cleanupMergeState(resolvedPath);
// Unstage the file — cleanupMergeState clears unmerged entries
// but the git add above leaves the file staged at stage 0
try {
execFileSync('git', ['restore', '--staged', resolvedPath], { stdio: 'pipe' });
} catch { /* may fail if file is new or not tracked */ }
continue;
}
cleanupMergeState(resolvedPath);
}
// Unresolved conflict — currentPath already has conflict markers
mergeConflicts.push(relPath);
}
}
if (mergeConflicts.length > 0) {
// Bug 4 fix: Preserve backup when returning with conflicts
return {
success: false,
skill: manifest.skill,
version: manifest.version,
mergeConflicts,
backupPending: true,
untrackedChanges: driftFiles.length > 0 ? driftFiles : undefined,
error: `Merge conflicts in: ${mergeConflicts.join(', ')}. Resolve manually then run recordSkillApplication(). Call clearBackup() after resolution or restoreBackup() + clearBackup() to abort.`,
};
}
// --- Structured operations ---
if (manifest.structured?.npm_dependencies) {
const pkgPath = path.join(projectRoot, 'package.json');
mergeNpmDependencies(pkgPath, manifest.structured.npm_dependencies);
}
if (manifest.structured?.env_additions) {
const envPath = path.join(projectRoot, '.env.example');
mergeEnvAdditions(envPath, manifest.structured.env_additions);
}
if (manifest.structured?.docker_compose_services) {
const composePath = path.join(projectRoot, 'docker-compose.yml');
mergeDockerComposeServices(
composePath,
manifest.structured.docker_compose_services,
);
}
// Run npm install if dependencies were added
if (
manifest.structured?.npm_dependencies &&
Object.keys(manifest.structured.npm_dependencies).length > 0
) {
runNpmInstall();
}
// --- Post-apply commands ---
if (manifest.post_apply && manifest.post_apply.length > 0) {
for (const cmd of manifest.post_apply) {
try {
execSync(cmd, { stdio: 'pipe', cwd: projectRoot, timeout: 120_000 });
} catch (postErr: any) {
// Rollback on post_apply failure
for (const f of addedFiles) {
try {
if (fs.existsSync(f)) fs.unlinkSync(f);
} catch { /* best effort */ }
}
restoreBackup();
clearBackup();
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: `post_apply command failed: ${cmd}${postErr.message}`,
};
}
}
}
// --- Update state ---
const fileHashes: Record<string, string> = {};
for (const relPath of [...manifest.adds, ...manifest.modifies]) {
const resolvedPath = resolvePathRemap(relPath, pathRemap);
const absPath = path.join(projectRoot, resolvedPath);
if (fs.existsSync(absPath)) {
fileHashes[resolvedPath] = computeFileHash(absPath);
}
}
// Store structured outcomes including the test command so applyUpdate() can run them
const outcomes: Record<string, unknown> = manifest.structured
? { ...manifest.structured }
: {};
if (manifest.test) {
outcomes.test = manifest.test;
}
recordSkillApplication(
manifest.skill,
manifest.version,
fileHashes,
Object.keys(outcomes).length > 0 ? outcomes : undefined,
);
// --- Bug 3 fix: Execute test command if defined ---
if (manifest.test) {
try {
execSync(manifest.test, {
stdio: 'pipe',
cwd: projectRoot,
timeout: 120_000,
});
} catch (testErr: any) {
// Tests failed — remove added files, restore backup and undo state
for (const f of addedFiles) {
try {
if (fs.existsSync(f)) fs.unlinkSync(f);
} catch { /* best effort */ }
}
restoreBackup();
// Re-read state and remove the skill we just recorded
const state = readState();
state.applied_skills = state.applied_skills.filter(
(s) => s.name !== manifest.skill,
);
writeState(state);
clearBackup();
return {
success: false,
skill: manifest.skill,
version: manifest.version,
error: `Tests failed: ${testErr.message}`,
};
}
}
// --- Cleanup ---
clearBackup();
return {
success: true,
skill: manifest.skill,
version: manifest.version,
untrackedChanges: driftFiles.length > 0 ? driftFiles : undefined,
};
} catch (err) {
// Remove newly added files before restoring backup
for (const f of addedFiles) {
try {
if (fs.existsSync(f)) fs.unlinkSync(f);
} catch { /* best effort */ }
}
restoreBackup();
clearBackup();
throw err;
} finally {
releaseLock();
}
}