@mc-and-his-agents/loom-installer 0.1.1 → 0.1.6

package/README.md

@@ -1,47 +1,55 @@
 # @mc-and-his-agents/loom-installer
 
-Loom 的 npm / npx 安装入口。
+Loom npm / npx installer.
 
-它负责两件事：
+The primary install mode is the complete Loom plugin surface. Single-skill install remains available for compatibility and advanced use.
 
-- 把 Loom 作为完整 plugin 接到 Codex 或 Claude
-- 把某个单独 Loom skill 接到对应宿主
+## Commands
 
-它不替代 Loom 当前的 Python runtime；真正的执行面仍然是仓库里的 Python 脚本与已发布的 skill / plugin 产物。
+```bash
+npx @mc-and-his-agents/loom-installer add plugin --host codex
+npx @mc-and-his-agents/loom-installer add plugin --host claude
+```
 
-## 命令面
+Single skill compatibility path:
 
 ```bash
-npx @mc-and-his-agents/loom-installer add plugin
-npx @mc-and-his-agents/loom-installer add skill loom-init
+npx @mc-and-his-agents/loom-installer add skill <skill-id> --host codex
+npx @mc-and-his-agents/loom-installer add skill <skill-id> --host claude
 ```
 
-也可以先安装再执行：
+You can also pin the installer first:
 
 ```bash
 npm install -D @mc-and-his-agents/loom-installer
-npx loom-installer add plugin
-npx loom-installer add skill loom-init
+npx loom-installer add plugin --host codex
 ```
 
-可选参数：
+Options:
 
 - `--host codex|claude|auto`
 - `--target <repo-root>`
 - `--force`
 - `--json`
 
-## 运行时要求
+## Requirements
 
 - Node `>=20`
 - Python `>=3.10`，推荐 `3.11+`
 
-## 发布说明
+## Payload Model
+
+The published package includes a generated payload. The payload is generated from the canonical root `.codex-plugin/` and `skills/` sources during build / pack / publish.
+
+Generated payload directories are not committed to git. The build step recreates them deterministically and `check:payload` verifies rebuild stability.
+
+## Release Notes
 
-本包支持 `npm publish`，但发布只在 `main` 上进行。
+Publishing only happens from `main`.
 
-发布模型：
+Release model:
 
-- PR 只做门禁，不直接发布 npm
-- `main` 是唯一发布真相源
-- publish 成功后再创建同版本 git tag
+- PRs run gates but do not publish npm.
+- `main` is the only release truth source.
+- Loom repository releases and installer npm package versions are maintained separately.
+- publish 成功后再创建 `loom-installer-v<version>` git tag 与同名前缀的 GitHub Release.

package/dist/src/codex.js

@@ -41,7 +41,7 @@ function ensureMarketplace(targetRoot, force) {
     }
     const expectedPath = './plugins/loom';
     const existing = marketplace.plugins.find((entry) => typeof entry === 'object' && entry !== null && entry.name === 'loom');
-    if (existing && existing.source?.path && existing.source.path !== expectedPath) {
+    if (existing && existing.source?.path && existing.source.path !== expectedPath && !force) {
         throw new InstallerError(`Codex marketplace already declares loom from a different path: ${existing.source.path}`, `refusing to take over non-Loom marketplace entry for loom: ${existing.source.path}`);
     }
     if (!existing) {

package/dist/test/installer.test.js

@@ -34,6 +34,12 @@ function prepareEnv(base) {
         LOOM_INSTALLER_PYTHON_BIN: resolveTestPython(),
     };
 }
+function writeCodexMarketplace(repoRoot, marketplace) {
+    const marketplacePath = join(repoRoot, '.agents', 'plugins', 'marketplace.json');
+    mkdirSync(join(repoRoot, '.agents', 'plugins'), { recursive: true });
+    writeFileSync(marketplacePath, JSON.stringify(marketplace, null, 2));
+    return marketplacePath;
+}
 function writeFakeClaude(binDir, logPath) {
     const scriptPath = join(binDir, 'claude');
     writeFileSync(scriptPath, `#!/bin/sh\nset -eu\nprintf '%s\\n' "$*" >> ${JSON.stringify(logPath)}\nif [ "$1" = "--version" ]; then\n  echo '2.1.0'\n  exit 0\nfi\nif [ "$1" = "plugin" ] && [ "$2" = "list" ] && [ "$3" = "--json" ]; then\n  echo '[{"name":"loom"}]'\n  exit 0\nfi\nexit 0\n`, { mode: 0o755 });
@@ -96,6 +102,67 @@ test('codex plugin install writes marketplace entry', () => {
     assert.equal(marketplace.plugins[0].name, 'loom');
     assert.equal(marketplace.plugins[0].source.path, './plugins/loom');
 });
+test('codex plugin install fails closed on marketplace conflicts without force', () => {
+    const base = fixtureRoot();
+    const envSource = prepareEnv(base);
+    mkdirSync(envSource.CODEX_HOME, { recursive: true });
+    const repoRoot = join(base, 'repo');
+    mkdirSync(repoRoot, { recursive: true });
+    writeCodexMarketplace(repoRoot, {
+        name: 'custom-marketplace',
+        plugins: [
+            {
+                name: 'loom',
+                source: {
+                    source: 'local',
+                    path: './plugins/not-loom',
+                },
+            },
+        ],
+    });
+    const parsed = {
+        mode: 'plugin',
+        options: {
+            host: 'codex',
+            target: repoRoot,
+            force: false,
+            json: false,
+        },
+    };
+    assert.throws(() => runInstaller(parsed, envSource, packageRoot()), /already declares loom from a different path/);
+});
+test('codex plugin install lets --force take over conflicting marketplace entry', () => {
+    const base = fixtureRoot();
+    const envSource = prepareEnv(base);
+    mkdirSync(envSource.CODEX_HOME, { recursive: true });
+    const repoRoot = join(base, 'repo');
+    mkdirSync(repoRoot, { recursive: true });
+    writeCodexMarketplace(repoRoot, {
+        name: 'custom-marketplace',
+        plugins: [
+            {
+                name: 'loom',
+                source: {
+                    source: 'local',
+                    path: './plugins/not-loom',
+                },
+            },
+        ],
+    });
+    const parsed = {
+        mode: 'plugin',
+        options: {
+            host: 'codex',
+            target: repoRoot,
+            force: true,
+            json: false,
+        },
+    };
+    const result = runInstaller(parsed, envSource, packageRoot());
+    const marketplace = JSON.parse(readFileSync(join(repoRoot, '.agents', 'plugins', 'marketplace.json'), 'utf8'));
+    assert.equal(result.mode, 'plugin');
+    assert.equal(marketplace.plugins[0].source.path, './plugins/loom');
+});
 test('codex skill install writes skills.config entry', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);
@@ -120,6 +187,84 @@ test('codex skill install writes skills.config entry', () => {
     assert.match(config, /loom-review\/SKILL\.md/);
     assert.match(config, /enabled = true/);
 });
+test('codex skill install fails closed on conflicting skills.config entry 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');
+    const parsed = {
+        mode: 'skill',
+        skillId: 'loom-review',
+        options: {
+            host: 'codex',
+            target: repoRoot,
+            force: false,
+            json: false,
+        },
+    };
+    assert.throws(() => runInstaller(parsed, envSource, packageRoot()), /already has loom-review from a different path/);
+});
+test('codex skill install lets --force take over conflicting skills.config entry', () => {
+    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');
+    const parsed = {
+        mode: 'skill',
+        skillId: 'loom-review',
+        options: {
+            host: 'codex',
+            target: repoRoot,
+            force: true,
+            json: false,
+        },
+    };
+    const result = runInstaller(parsed, envSource, packageRoot());
+    const config = readFileSync(join(envSource.CODEX_HOME, 'config.toml'), 'utf8');
+    assert.equal(result.mode, 'skill');
+    assert.doesNotMatch(config, /\/tmp\/other\/loom-review\/SKILL\.md/);
+    assert.match(config, /loom-review\/SKILL\.md/);
+});
+test('single-skill installs stay scoped to the named skill for codex', () => {
+    const base = fixtureRoot();
+    const envSource = prepareEnv(base);
+    mkdirSync(envSource.CODEX_HOME, { recursive: true });
+    const repoRoot = join(base, 'repo');
+    mkdirSync(repoRoot, { recursive: true });
+    const parsed = {
+        mode: 'skill',
+        skillId: 'loom-init',
+        options: {
+            host: 'codex',
+            target: repoRoot,
+            force: false,
+            json: false,
+        },
+    };
+    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, 'plugins', 'loom')), false);
+    assert.equal(existsSync(join(repoRoot, '.agents', 'plugins', 'marketplace.json')), false);
+});
 test('claude plugin install assembles marketplace and calls claude CLI', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);
@@ -149,6 +294,28 @@ test('claude plugin install assembles marketplace and calls claude CLI', () => {
     assert.match(log, /plugin marketplace add/);
     assert.match(log, /plugin install loom@loom-local/);
 });
+test('single-skill installs stay scoped to the named skill for claude', () => {
+    const base = fixtureRoot();
+    const envSource = prepareEnv(base);
+    mkdirSync(envSource.CLAUDE_CONFIG_DIR, { recursive: true });
+    const repoRoot = join(base, 'repo');
+    mkdirSync(repoRoot, { recursive: true });
+    const parsed = {
+        mode: 'skill',
+        skillId: 'loom-init',
+        options: {
+            host: 'claude',
+            target: repoRoot,
+            force: false,
+            json: false,
+        },
+    };
+    const result = runInstaller(parsed, envSource, packageRoot());
+    assert.equal(result.mode, 'skill');
+    assert.match(result.warnings[0] ?? '', /does not expose the full Loom plugin surface/);
+    assert.equal(existsSync(join(repoRoot, '.claude', 'skills', 'loom-init', 'SKILL.md')), true);
+    assert.equal(existsSync(join(repoRoot, '.claude', 'marketplaces', 'loom-local')), false);
+});
 test('cli emits structured json on success', () => {
     const base = fixtureRoot();
     const envSource = prepareEnv(base);

package/package.json

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