@mc-and-his-agents/loom-installer 0.1.53 → 0.1.55

package/dist/src/codex.js

@@ -1,4 +1,3 @@
-import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { InstallerError, copyTree, dirExists, ensureDirectory, fileExists, readJson, replaceTree, writeJson } from './utils.js';
 function codexMarketplacePath(targetRoot) {
@@ -54,70 +53,6 @@ function ensureMarketplace(targetRoot, force) {
     writeJson(marketplacePath, marketplace);
     return [marketplacePath];
 }
-function parseSkillBlocks(content) {
-    const lines = content.split('\n');
-    const blocks = [];
-    for (let index = 0; index < lines.length; index += 1) {
-        if (lines[index].trim() !== '[[skills.config]]') {
-            continue;
-        }
-        const blockLines = [lines[index]];
-        index += 1;
-        while (index < lines.length && !lines[index].trim().startsWith('[[')) {
-            blockLines.push(lines[index]);
-            index += 1;
-        }
-        index -= 1;
-        const raw = blockLines.join('\n');
-        const pathMatch = raw.match(/^path\s*=\s*"([^"]+)"/m);
-        const enabledMatch = raw.match(/^enabled\s*=\s*(true|false)/m);
-        blocks.push({
-            raw,
-            path: pathMatch?.[1] ?? null,
-            enabled: enabledMatch ? enabledMatch[1] === 'true' : null,
-        });
-    }
-    return blocks;
-}
-function upsertSkillBlock(configPath, desiredSkillPath, skillId, force) {
-    const content = fileExists(configPath) ? readFileSync(configPath, 'utf8') : '';
-    const blocks = parseSkillBlocks(content);
-    const skillDir = skillId.startsWith('loom-') ? skillId : `loom-${skillId}`;
-    const conflicting = blocks.filter((block) => {
-        if (!block.path) {
-            return false;
-        }
-        return block.path.endsWith(`/${skillDir}/SKILL.md`) && block.path !== desiredSkillPath;
-    });
-    if (conflicting.length > 0 && !force) {
-        throw new InstallerError(`Codex already has ${skillId} from a different path`, `Codex already has ${skillId} from a different path`);
-    }
-    let nextContent = content;
-    for (const block of conflicting) {
-        nextContent = nextContent.replace(`${block.raw}\n`, '').replace(block.raw, '');
-    }
-    const existingBlock = parseSkillBlocks(nextContent).find((block) => block.path === desiredSkillPath);
-    if (existingBlock) {
-        const enabledBlock = existingBlock.raw.match(/^enabled\s*=\s*false/m)
-            ? existingBlock.raw.replace(/^enabled\s*=\s*false/m, 'enabled = true')
-            : existingBlock.enabled === null
-                ? `${existingBlock.raw}\nenabled = true`
-                : existingBlock.raw;
-        nextContent = nextContent.replace(existingBlock.raw, enabledBlock);
-    }
-    else {
-        if (nextContent && !nextContent.endsWith('\n')) {
-            nextContent += '\n';
-        }
-        nextContent += `\n[[skills.config]]\npath = ${JSON.stringify(desiredSkillPath)}\nenabled = true\n`;
-    }
-    ensureDirectory(join(configPath, '..'));
-    writeFileSync(configPath, nextContent.replace(/^\n+/, ''), 'utf8');
-}
-function verifySkillEnabled(configPath, desiredSkillPath) {
-    const content = fileExists(configPath) ? readFileSync(configPath, 'utf8') : '';
-    return parseSkillBlocks(content).some((block) => block.path === desiredSkillPath && block.enabled !== false);
-}
 export function installCodexPlugin(targetRoot, packageRoot, manifest, force) {
     const pluginSource = join(packageRoot, 'payload', manifest.plugin.relative_path);
     const pluginTarget = join(targetRoot, 'plugins', 'loom');
@@ -155,37 +90,34 @@ export function installCodexPlugin(targetRoot, packageRoot, manifest, force) {
         fail_closed_reason: null,
     };
 }
-export function installCodexSkill(env, packageRoot, skill, force) {
+export function installCodexSkill(_env, targetRoot, packageRoot, skill, force) {
     const skillDirName = skill.id.startsWith('loom-') ? skill.id : `loom-${skill.id}`;
     const sourceDir = join(packageRoot, 'payload', skill.relative_path);
-    const targetDir = join(env.codexHome, 'skills', skillDirName);
+    const targetDir = join(targetRoot, '.agents', 'skills', skillDirName);
     const skillMarkdownPath = join(targetDir, 'SKILL.md');
-    const configPath = join(env.codexHome, 'config.toml');
-    ensureDirectory(join(env.codexHome, 'skills'));
+    ensureDirectory(join(targetRoot, '.agents', 'skills'));
     if (dirExists(targetDir)) {
         if (!force && !fileExists(skillMarkdownPath)) {
-            throw new InstallerError(`existing Codex skill directory is not Loom-managed: ${targetDir}`, `refusing to take over non-Loom Codex skill directory: ${targetDir}`);
+            throw new InstallerError(`target already contains .agents/skills/${skillDirName} but it is not a Loom skill: ${targetDir}`, `refusing to take over non-Loom repo skill directory: ${targetDir}`);
         }
         replaceTree(sourceDir, targetDir);
     }
     else {
         copyTree(sourceDir, targetDir, true);
     }
-    ensureDirectory(env.codexHome);
-    upsertSkillBlock(configPath, skillMarkdownPath, skill.id, force);
-    if (!verifySkillEnabled(configPath, skillMarkdownPath)) {
-        throw new InstallerError(`Codex config did not enable ${skill.id}`);
+    if (!fileExists(skillMarkdownPath)) {
+        throw new InstallerError(`Codex repo skill install is missing SKILL.md: ${skillMarkdownPath}`);
     }
     return {
         mode: 'skill',
         host: 'codex',
         status: 'installed',
-        installed_paths: [targetDir, configPath],
+        installed_paths: [targetDir],
         verification: [
             `verified skill payload at ${targetDir}`,
-            `verified skills.config entry for ${skill.id}`,
+            `verified repo skill discovery path at ${skillMarkdownPath}`,
         ],
-        warnings: ['Codex single-skill install exposes only the named skill, not the full Loom plugin surface.'],
+        warnings: ['Codex repo-scoped single-skill install exposes only the named skill, not the full Loom plugin surface.'],
         fail_closed_reason: null,
     };
 }

package/dist/src/index.js

@@ -170,6 +170,6 @@ function installForHost(input) {
     }
     const skill = resolveSkillRecord(manifest, parsed.skillId ?? '');
     return host === 'codex'
-        ? installCodexSkill(env, packageRoot, skill, parsed.options.force)
+        ? installCodexSkill(env, targetRoot, packageRoot, skill, parsed.options.force)
         : installClaudeSkill(targetRoot, packageRoot, skill, parsed.options.force);
 }

package/dist/test/installer.test.js

@@ -173,13 +173,12 @@ test('codex plugin install lets --force take over conflicting marketplace entry'
     assert.equal(result.mode, 'plugin');
     assert.equal(marketplace.plugins[0].source.path, './plugins/loom');
 });
-test('codex skill install writes skills.config entry', () => {
+test('codex skill install writes repo-scoped .agents skill', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);
     mkdirSync(envSource.CODEX_HOME, { recursive: true });
     const repoRoot = join(base, 'repo');
     mkdirSync(repoRoot, { recursive: true });
-    writeFileSync(join(envSource.CODEX_HOME, 'config.toml'), 'model = "gpt-5"\n', 'utf8');
     const parsed = {
         mode: 'skill',
         skillId: 'loom-review',
@@ -191,26 +190,19 @@ test('codex skill install writes skills.config entry', () => {
         },
     };
     const result = runInstaller(parsed, envSource, packageRoot());
-    const config = readFileSync(join(envSource.CODEX_HOME, 'config.toml'), 'utf8');
+    const skillPath = join(repoRoot, '.agents', 'skills', 'loom-review', 'SKILL.md');
     assert.equal(result.mode, 'skill');
-    assert.match(config, /\[\[skills\.config\]\]/);
-    assert.match(config, /loom-review\/SKILL\.md/);
-    assert.match(config, /enabled = true/);
+    assert.equal(existsSync(skillPath), true);
+    assert.equal(existsSync(join(envSource.CODEX_HOME, 'config.toml')), false);
 });
-test('codex skill install fails closed on conflicting skills.config entry without force', () => {
+test('codex skill install fails closed on conflicting repo skill directory without force', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);
     mkdirSync(envSource.CODEX_HOME, { recursive: true });
     const repoRoot = join(base, 'repo');
     mkdirSync(repoRoot, { recursive: true });
-    writeFileSync(join(envSource.CODEX_HOME, 'config.toml'), [
-        'model = "gpt-5"',
-        '',
-        '[[skills.config]]',
-        'path = "/tmp/other/loom-review/SKILL.md"',
-        'enabled = true',
-        '',
-    ].join('\n'), 'utf8');
+    mkdirSync(join(repoRoot, '.agents', 'skills', 'loom-review'), { recursive: true });
+    writeFileSync(join(repoRoot, '.agents', 'skills', 'loom-review', 'README.md'), '# Not a Loom skill\n', 'utf8');
     const parsed = {
         mode: 'skill',
         skillId: 'loom-review',
@@ -221,22 +213,16 @@ test('codex skill install fails closed on conflicting skills.config entry withou
             json: false,
         },
     };
-    assert.throws(() => runInstaller(parsed, envSource, packageRoot()), /already has loom-review from a different path/);
+    assert.throws(() => runInstaller(parsed, envSource, packageRoot()), /not a Loom skill/);
 });
-test('codex skill install lets --force take over conflicting skills.config entry', () => {
+test('codex skill install lets --force take over conflicting repo skill directory', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);
     mkdirSync(envSource.CODEX_HOME, { recursive: true });
     const repoRoot = join(base, 'repo');
     mkdirSync(repoRoot, { recursive: true });
-    writeFileSync(join(envSource.CODEX_HOME, 'config.toml'), [
-        'model = "gpt-5"',
-        '',
-        '[[skills.config]]',
-        'path = "/tmp/other/loom-review/SKILL.md"',
-        'enabled = true',
-        '',
-    ].join('\n'), 'utf8');
+    mkdirSync(join(repoRoot, '.agents', 'skills', 'loom-review'), { recursive: true });
+    writeFileSync(join(repoRoot, '.agents', 'skills', 'loom-review', 'README.md'), '# Not a Loom skill\n', 'utf8');
     const parsed = {
         mode: 'skill',
         skillId: 'loom-review',
@@ -248,10 +234,10 @@ test('codex skill install lets --force take over conflicting skills.config entry
         },
     };
     const result = runInstaller(parsed, envSource, packageRoot());
-    const config = readFileSync(join(envSource.CODEX_HOME, 'config.toml'), 'utf8');
+    const skillPath = join(repoRoot, '.agents', 'skills', 'loom-review', 'SKILL.md');
     assert.equal(result.mode, 'skill');
-    assert.doesNotMatch(config, /\/tmp\/other\/loom-review\/SKILL\.md/);
-    assert.match(config, /loom-review\/SKILL\.md/);
+    assert.equal(existsSync(skillPath), true);
+    assert.equal(existsSync(join(repoRoot, '.agents', 'skills', 'loom-review', 'README.md')), false);
 });
 test('single-skill installs stay scoped to the named skill for codex', () => {
     const base = fixtureRoot();
@@ -272,6 +258,7 @@ test('single-skill installs stay scoped to the named skill for codex', () => {
     const result = runInstaller(parsed, envSource, packageRoot());
     assert.equal(result.mode, 'skill');
     assert.match(result.warnings[0] ?? '', /only the named skill, not the full Loom plugin surface/);
+    assert.equal(existsSync(join(repoRoot, '.agents', 'skills', 'loom-init', 'SKILL.md')), true);
     assert.equal(existsSync(join(repoRoot, 'plugins', 'loom')), false);
     assert.equal(existsSync(join(repoRoot, '.agents', 'plugins', 'marketplace.json')), false);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mc-and-his-agents/loom-installer",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "description": "Node installer for Loom plugin and single-skill installation surfaces.",
   "type": "module",
   "bin": {