@givolt/i3-composer-agent 0.6.12 → 1.0.1

package/rebrand/templates/codebuddy-setup.md

@@ -1,12 +1,60 @@
 # Using i3 Composer Agent with CodeBuddy
 
-Prepare the complete plugin inside the project where you want to use it:
+## Desktop IDE installation
+
+Run inside your business project:
 
 ```bash
 npx @givolt/i3-composer-agent --codebuddy
 ```
 
-In the CodeBuddy chat, register the prepared directory and install the plugin:
+The terminal wizard preselects CodeBuddy, still allows multiple tools, and asks
+for project or global scope before installing. Project scope writes these paths:
+
+- `.codebuddy/skills/` — all {{SKILL_COUNT}} skills with their original IDs.
+- `.codebuddy/references/` — shared checklists used by skill-relative links.
+- `.codebuddy/commands/` — all {{COMMAND_COUNT}} existing lifecycle workflows.
+- `.codebuddy/agents/` — all {{PERSONA_COUNT}} persona definitions.
+
+Global scope uses the same layout under `~/.codebuddy/`. Existing assets require
+confirmed replacement and are preserved in backup directories. Settings are
+not replaced. Reload the CodeBuddy window or start a new chat, then inspect
+the Skills list and type `/` to inspect the command menu.
+
+```text
+/spec
+/plan
+/build
+/build auto
+/review
+/ship
+```
+
+The command wrappers reference installed skill IDs without the plugin namespace.
+Their workflow content and approval gates are retained. File installation does
+not itself prove that the IDE has discovered or executed every workflow.
+
+For multiple tools or a noninteractive installation:
+
+```bash
+npx @givolt/i3-composer-agent --agents codebuddy,codex --scope project --yes
+npx @givolt/i3-composer-agent --codebuddy --scope global --yes
+```
+
+CodeBuddy documents [IDE skills](https://www.codebuddy.cn/docs/ide/Features/Skills)
+and [IDE custom commands](https://www.codebuddy.cn/docs/ide/User-guide/Slash-Commands).
+The directory layout follows its [configuration directory reference](https://www.codebuddy.cn/docs/cli/codebuddy-dir).
+
+## CodeBuddy Code native plugin registration
+
+For the terminal CodeBuddy Code plugin manager, explicitly prepare the full
+plugin instead of native skill installation:
+
+```bash
+npx @givolt/i3-composer-agent --prepare --codebuddy
+```
+
+In CodeBuddy Code, register the prepared directory and install the plugin:
 
 ```text
 /plugin marketplace add ./i3-composer-agent
@@ -14,10 +62,10 @@ In the CodeBuddy chat, register the prepared directory and install the plugin:
 ```
 
 Use the absolute directory printed by the CLI if CodeBuddy has a different
-working directory. Choose the intended installation scope in CodeBuddy's native
+working directory. Choose the intended installation scope in CodeBuddy Code's native
 plugin manager. Reload plugins or start a new session after installation.
 
-CodeBuddy supports the existing `.claude-plugin/plugin.json` compatibility
+CodeBuddy Code supports the existing `.claude-plugin/plugin.json` compatibility
 manifest. It declares `.claude/commands/` and `commands/`, preserving the nine
 original lifecycle commands and their workflow content.
 
@@ -33,9 +81,8 @@ original lifecycle commands and their workflow content.
 Skill IDs, persona names, artifact paths, and workflow gates retain their
 upstream behavior. The plugin namespace changes to `i3-composer-agent`.
 
-The bundle includes all skills and shared `references/`. Installing individual
-skills is a different distribution method and does not install the command
-wrappers or persona definitions.
+The prepared plugin includes all skills, personas, commands, hooks and shared
+`references/`. Native skill installation above does not enable plugin hooks.
 
-The CLI prepares files and prints registration commands. Actual host discovery
+In this explicit mode the CLI prepares files and prints registration commands. Actual host discovery
 and model execution should be verified after registering the plugin.

package/rebrand/templates/codex-setup.md

@@ -1,12 +1,23 @@
 # Using i3 Composer Agent with Codex
 
-Prepare the complete plugin inside the project where you want to use it:
+For the multi-tool native skill wizard, run in your project:
 
 ```bash
 npx @givolt/i3-composer-agent --codex
 ```
 
-The CLI copies a persistent `./i3-composer-agent/` bundle and prints these
+Choose project or global scope. Native installation uses `.agents/skills/`
+or `~/.agents/skills/`, plus the sibling `references/` directory. It retains
+the {{SKILL_COUNT}} original skill IDs. This mode does not add short lifecycle
+slash commands or enable plugin hooks.
+
+For complete plugin registration, prepare a persistent bundle explicitly:
+
+```bash
+npx @givolt/i3-composer-agent --prepare --codex
+```
+
+This mode copies a persistent `./i3-composer-agent/` bundle and prints these
 native registration commands. Run them to enable the plugin:
 
 ```bash
@@ -14,7 +25,7 @@ codex plugin marketplace add ./i3-composer-agent
 codex plugin add i3-composer-agent@i3-composer-agent
 ```
 
-Start a new Codex session after registration. All 25 existing skills keep their
+Start a new Codex session after registration. All {{SKILL_COUNT}} existing skills keep their
 original IDs. In CLI/IDE, use `/skills` or `$spec-driven-development`; in chat,
 explicitly request the relevant skill from i3 Composer Agent.
 

package/rebrand/tests/pipeline.test.cjs

@@ -0,0 +1,185 @@
+'use strict';
+
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const { spawnSync } = require('node:child_process');
+const root = path.resolve(__dirname, '../..');
+const baselineVersion = require('../upstream.json').upstreamVersion;
+
+function run(directory, executable, args) {
+  return spawnSync(executable, args, { cwd: directory, encoding: 'utf8' });
+}
+function git(directory, args) {
+  const result = run(directory, 'git', args);
+  assert.equal(result.status, 0, result.stderr);
+  return result.stdout.trim();
+}
+function node(directory, file, args = []) { return run(directory, process.execPath, [file, ...args]); }
+function fixture(t, branch = 'release/test-candidate') {
+  const directory = fs.mkdtempSync(path.join(os.tmpdir(), 'i3-agent-replay-'));
+  t.after(() => fs.rmSync(directory, { recursive: true, force: true }));
+  for (const name of ['skills', 'references', 'agents', 'commands', '.claude', '.gemini', '.claude-plugin', '.codex-plugin', '.agents', 'hooks', 'docs', 'scripts', 'evals', 'rebrand', 'LICENSE', 'plugin.json', 'README.md']) {
+    fs.cpSync(path.join(root, name), path.join(directory, name), { recursive: true, filter: file => !file.includes(`${path.sep}results${path.sep}`) });
+  }
+  // Model an upstream source checkout, including when this suite runs in a packed branded bundle.
+  for (const name of ['plugin.json', '.claude-plugin/plugin.json', '.codex-plugin/plugin.json']) {
+    const file = path.join(directory, name);
+    const data = JSON.parse(fs.readFileSync(file, 'utf8'));
+    data.name = 'agent-skills';
+    data.version = baselineVersion;
+    fs.writeFileSync(file, JSON.stringify(data, null, 2) + '\n');
+  }
+  git(directory, ['init', '--initial-branch', branch]);
+  git(directory, ['config', 'user.name', 'Pipeline Test']);
+  git(directory, ['config', 'user.email', 'pipeline@example.test']);
+  git(directory, ['add', '.']);
+  git(directory, ['commit', '-m', 'upstream fixture']);
+  return directory;
+}
+function record(directory) {
+  const result = node(directory, 'rebrand/record-upstream.cjs', ['HEAD']);
+  assert.equal(result.status, 0, result.stderr);
+}
+function apply(directory) {
+  const result = node(directory, 'rebrand/apply.cjs', ['--apply']);
+  assert.equal(result.status, 0, result.stderr);
+}
+
+test('a source checkout generates a complete, repeatable branded distribution', t => {
+  const directory = fixture(t);
+  record(directory);
+  apply(directory);
+  const pkg = JSON.parse(fs.readFileSync(path.join(directory, 'package.json'), 'utf8'));
+  assert.equal(pkg.name, '@givolt/i3-composer-agent');
+  const brand = JSON.parse(fs.readFileSync(path.join(directory, 'rebrand/brand.json'), 'utf8'));
+  assert.equal(pkg.version, brand.releaseVersion);
+  assert.equal(fs.existsSync(path.join(directory, 'bin/i3-composer-agent.cjs')), true);
+  assert.equal(node(directory, 'scripts/validate-brand.cjs').status, 0);
+  const check = node(directory, 'rebrand/apply.cjs', ['--check']);
+  assert.equal(check.status, 0, check.stdout + check.stderr);
+});
+
+test('brand fixes advance independently while preserving upstream provenance', t => {
+  const directory = fixture(t);
+  record(directory);
+  const upstreamFile = path.join(directory, 'rebrand/upstream.json');
+  const originalUpstream = fs.readFileSync(upstreamFile, 'utf8');
+  const upstream = JSON.parse(originalUpstream);
+  const brandFile = path.join(directory, 'rebrand/brand.json');
+  const brand = JSON.parse(fs.readFileSync(brandFile, 'utf8'));
+  const releaseVersion = `${Number(upstream.upstreamVersion.split('.')[0]) + 1}.0.1`;
+  brand.releaseVersion = releaseVersion;
+  fs.writeFileSync(brandFile, JSON.stringify(brand, null, 2) + '\n');
+  apply(directory);
+  const packageFile = path.join(directory, 'package.json');
+  const originalPackage = fs.readFileSync(packageFile, 'utf8');
+  const pkg = JSON.parse(originalPackage);
+  assert.equal(pkg.version, releaseVersion);
+  assert.equal(pkg.i3ComposerAgent.upstreamVersion, upstream.upstreamVersion);
+  assert.equal(pkg.i3ComposerAgent.upstreamCommit, upstream.upstreamCommit);
+  assert.equal(fs.readFileSync(upstreamFile, 'utf8'), originalUpstream);
+  const releaseLabel = `i3 Composer Agent v${releaseVersion}`;
+  const upstreamLabel = `Based on agent-skills v${upstream.upstreamVersion}`;
+  for (const output of [fs.readFileSync(path.join(directory, 'README.md'), 'utf8'), node(directory, 'bin/i3-composer-agent.cjs', ['--help']).stdout]) {
+    assert.ok(output.includes(releaseLabel), output);
+    assert.ok(output.includes(upstreamLabel), output);
+  }
+  assert.equal(node(directory, 'bin/i3-composer-agent.cjs', ['--version']).stdout.trim(), releaseVersion);
+  const dryRun = node(directory, 'bin/i3-composer-agent.cjs', ['--extract', '--dry-run', '--dir', directory + '-prepared']);
+  assert.equal(dryRun.status, 0, dryRun.stderr);
+  assert.equal(JSON.parse(dryRun.stdout).upstreamVersion, upstream.upstreamVersion);
+  assert.equal(node(directory, 'scripts/validate-brand.cjs').status, 0);
+  pkg.i3ComposerAgent.upstreamVersion = releaseVersion;
+  fs.writeFileSync(packageFile, JSON.stringify(pkg));
+  assert.notEqual(node(directory, 'scripts/validate-brand.cjs').status, 0);
+  fs.writeFileSync(packageFile, originalPackage);
+  assert.equal(node(directory, 'rebrand/apply.cjs', ['--check']).status, 0);
+});
+
+test('writing a brand transform on the protected source branch changes nothing', t => {
+  const directory = fixture(t, 'agent/source');
+  const before = fs.readFileSync(path.join(directory, 'plugin.json'));
+  const result = node(directory, 'rebrand/apply.cjs', ['--apply']);
+  assert.notEqual(result.status, 0);
+  assert.match(result.stderr, /source branch/i);
+  assert.deepEqual(fs.readFileSync(path.join(directory, 'plugin.json')), before);
+  assert.equal(fs.existsSync(path.join(directory, 'package.json')), false);
+});
+
+test('a reviewed upstream catalog can grow without losing its new skill or command', t => {
+  const directory = fixture(t);
+  const skill = path.join(directory, 'skills/upstream-new-skill');
+  fs.mkdirSync(skill);
+  fs.writeFileSync(path.join(skill, 'SKILL.md'), '---\nname: upstream-new-skill\ndescription: New upstream capability.\n---\n# Upstream capability\n');
+  fs.writeFileSync(path.join(directory, '.claude/commands/upstream-new-command.md'), '---\ndescription: Invoke the new upstream capability.\n---\nUse agent-skills:upstream-new-skill.\n');
+  git(directory, ['add', 'skills', '.claude/commands']);
+  git(directory, ['commit', '-m', 'new upstream capability']);
+  record(directory);
+  apply(directory);
+  const result = node(directory, 'scripts/validate-brand.cjs');
+  assert.equal(result.status, 0, result.stderr);
+  const description = JSON.parse(fs.readFileSync(path.join(directory, '.codex-plugin/plugin.json'), 'utf8')).interface.longDescription;
+  assert.match(description, /26 engineering skills/);
+  const readme = fs.readFileSync(path.join(directory, 'README.md'), 'utf8');
+  assert.match(readme, /upstream-new-skill/);
+  assert.match(readme, /upstream-new-command/);
+});
+
+test('missing files and altered skill identifiers fail preservation validation', t => {
+  const directory = fixture(t);
+  record(directory);
+  apply(directory);
+  const file = path.join(directory, 'skills/using-agent-skills/SKILL.md');
+  const original = fs.readFileSync(file, 'utf8');
+  fs.writeFileSync(file, original.replace('name: using-agent-skills', 'name: renamed-meta-skill'));
+  assert.notEqual(node(directory, 'scripts/validate-brand.cjs').status, 0);
+  fs.writeFileSync(file, original);
+  fs.rmSync(file);
+  assert.notEqual(node(directory, 'scripts/validate-brand.cjs').status, 0);
+});
+
+test('checkout line endings do not masquerade as an upstream skill change', t => {
+  const directory = fixture(t);
+  record(directory);
+  const file = path.join(directory, 'skills/using-agent-skills/SKILL.md');
+  fs.writeFileSync(file, fs.readFileSync(file, 'utf8').replace(/\r?\n/g, '\r\n'));
+  const script = path.join(directory, 'scripts/validate-versions.js');
+  fs.writeFileSync(script, fs.readFileSync(script, 'utf8').replace(/\r?\n/g, '\r\n'));
+  apply(directory);
+  assert.equal(node(directory, 'scripts/validate-brand.cjs').status, 0);
+});
+
+test('a new upstream package manifest requires an explicit distribution adaptation', t => {
+  const directory = fixture(t);
+  record(directory);
+  fs.writeFileSync(path.join(directory, 'package.json'), '{"name":"agent-skills","dependencies":{"upstream-runtime":"1.0.0"}}\n');
+  const before = fs.readFileSync(path.join(directory, 'plugin.json'));
+  const result = node(directory, 'rebrand/apply.cjs', ['--apply']);
+  assert.notEqual(result.status, 0);
+  assert.match(result.stderr, /package\.json/);
+  assert.deepEqual(fs.readFileSync(path.join(directory, 'plugin.json')), before);
+});
+
+test('a distribution without repository CI files remains unchanged by a replay check', t => {
+  const directory = fixture(t);
+  record(directory);
+  apply(directory);
+  fs.rmSync(path.join(directory, '.github'), { recursive: true, force: true });
+  const result = node(directory, 'rebrand/apply.cjs', ['--check']);
+  assert.equal(result.status, 0, result.stdout + result.stderr);
+  assert.equal(fs.existsSync(path.join(directory, '.github')), false);
+});
+
+test('Finder metadata does not masquerade as an upstream runtime file', t => {
+  const directory = fixture(t);
+  record(directory);
+  fs.writeFileSync(path.join(directory, 'skills/.DS_Store'), 'Finder metadata');
+  fs.writeFileSync(path.join(directory, 'skills/spec-driven-development/.DS_Store'), 'Finder metadata');
+  apply(directory);
+  assert.equal(node(directory, 'scripts/validate-brand.cjs').status, 0);
+  const result = node(directory, 'rebrand/apply.cjs', ['--check']);
+  assert.equal(result.status, 0, result.stdout + result.stderr);
+});

package/rebrand/upstream.json

@@ -0,0 +1,171 @@
+{
+  "upstreamCommit": "1401c8b8030e023baeebb31781a6653fe8e93026",
+  "upstreamVersion": "0.6.12",
+  "skills": [
+    "api-and-interface-design",
+    "browser-testing-with-devtools",
+    "ci-cd-and-automation",
+    "code-review-and-quality",
+    "code-simplification",
+    "constraint-driven-development",
+    "context-engineering",
+    "debugging-and-error-recovery",
+    "deprecation-and-migration",
+    "documentation-and-adrs",
+    "doubt-driven-development",
+    "frontend-ui-engineering",
+    "git-workflow-and-versioning",
+    "idea-refine",
+    "incremental-implementation",
+    "interview-me",
+    "observability-and-instrumentation",
+    "performance-optimization",
+    "planning-and-task-breakdown",
+    "security-and-hardening",
+    "shipping-and-launch",
+    "source-driven-development",
+    "spec-driven-development",
+    "test-driven-development",
+    "using-agent-skills"
+  ],
+  "commands": [
+    "build",
+    "code-simplify",
+    "constraints",
+    "plan",
+    "review",
+    "ship",
+    "spec",
+    "test",
+    "webperf"
+  ],
+  "personas": [
+    "code-reviewer",
+    "security-auditor",
+    "test-engineer",
+    "web-performance-auditor"
+  ],
+  "references": [
+    "references/accessibility-checklist.md",
+    "references/definition-of-done.md",
+    "references/observability-checklist.md",
+    "references/orchestration-patterns.md",
+    "references/performance-checklist.md",
+    "references/security-checklist.md",
+    "references/testing-patterns.md"
+  ],
+  "runtimeFiles": [
+    ".agents/plugins/marketplace.json",
+    ".claude-plugin/marketplace.json",
+    ".claude-plugin/plugin.json",
+    ".claude/commands/build.md",
+    ".claude/commands/code-simplify.md",
+    ".claude/commands/constraints.md",
+    ".claude/commands/plan.md",
+    ".claude/commands/review.md",
+    ".claude/commands/ship.md",
+    ".claude/commands/spec.md",
+    ".claude/commands/test.md",
+    ".claude/commands/webperf.md",
+    ".codex-plugin/plugin.json",
+    ".gemini/commands/build.toml",
+    ".gemini/commands/code-simplify.toml",
+    ".gemini/commands/constraints.toml",
+    ".gemini/commands/planning.toml",
+    ".gemini/commands/review.toml",
+    ".gemini/commands/ship.toml",
+    ".gemini/commands/spec.toml",
+    ".gemini/commands/test.toml",
+    ".gemini/commands/webperf.toml",
+    "LICENSE",
+    "agents/code-reviewer.md",
+    "agents/security-auditor.md",
+    "agents/test-engineer.md",
+    "agents/web-performance-auditor.md",
+    "commands/build.toml",
+    "commands/code-simplify.toml",
+    "commands/constraints.toml",
+    "commands/planning.toml",
+    "commands/review.toml",
+    "commands/ship.toml",
+    "commands/spec.toml",
+    "commands/test.toml",
+    "commands/webperf.toml",
+    "hooks/SDD-CACHE.md",
+    "hooks/SIMPLIFY-IGNORE.md",
+    "hooks/sdd-cache-post.sh",
+    "hooks/sdd-cache-pre.sh",
+    "hooks/sdd-cache-test.sh",
+    "hooks/session-start-test.sh",
+    "hooks/session-start.sh",
+    "hooks/simplify-ignore-test.sh",
+    "hooks/simplify-ignore.sh",
+    "plugin.json",
+    "references/accessibility-checklist.md",
+    "references/definition-of-done.md",
+    "references/observability-checklist.md",
+    "references/orchestration-patterns.md",
+    "references/performance-checklist.md",
+    "references/security-checklist.md",
+    "references/testing-patterns.md",
+    "skills/api-and-interface-design/SKILL.md",
+    "skills/browser-testing-with-devtools/SKILL.md",
+    "skills/ci-cd-and-automation/SKILL.md",
+    "skills/code-review-and-quality/SKILL.md",
+    "skills/code-simplification/SKILL.md",
+    "skills/constraint-driven-development/SKILL.md",
+    "skills/constraint-driven-development/references/floor-guard.md",
+    "skills/context-engineering/SKILL.md",
+    "skills/debugging-and-error-recovery/SKILL.md",
+    "skills/deprecation-and-migration/SKILL.md",
+    "skills/documentation-and-adrs/SKILL.md",
+    "skills/doubt-driven-development/SKILL.md",
+    "skills/frontend-ui-engineering/SKILL.md",
+    "skills/git-workflow-and-versioning/SKILL.md",
+    "skills/idea-refine/SKILL.md",
+    "skills/idea-refine/examples.md",
+    "skills/idea-refine/frameworks.md",
+    "skills/idea-refine/refinement-criteria.md",
+    "skills/idea-refine/scripts/idea-refine.sh",
+    "skills/incremental-implementation/SKILL.md",
+    "skills/interview-me/SKILL.md",
+    "skills/observability-and-instrumentation/SKILL.md",
+    "skills/performance-optimization/SKILL.md",
+    "skills/performance-optimization/references/optimization-patterns.md",
+    "skills/planning-and-task-breakdown/SKILL.md",
+    "skills/security-and-hardening/SKILL.md",
+    "skills/security-and-hardening/references/hardening-patterns.md",
+    "skills/shipping-and-launch/SKILL.md",
+    "skills/source-driven-development/SKILL.md",
+    "skills/spec-driven-development/SKILL.md",
+    "skills/test-driven-development/SKILL.md",
+    "skills/using-agent-skills/SKILL.md"
+  ],
+  "skillFrontmatter": {
+    "api-and-interface-design": "44f904d462977e9514f439ac7c057b8691613ba8160360ad9d28b830d3a24001",
+    "browser-testing-with-devtools": "e235631718d18a0527d00eb718ecece2218bbf205d742632f8197b30c052e96b",
+    "ci-cd-and-automation": "dd73253ec445a9af27ebeab74404ee7a770919e40ec9db0b34af4fa9ec36bf7c",
+    "code-review-and-quality": "bf3dda5e08190fcf00175a5053f53550bca91ca32b0a06e4b97cd33e046e8eb7",
+    "code-simplification": "cee4dc87b4bc95d77fe646d4ab9e66c9a422dd081a833d657d618aaf2967b5a2",
+    "constraint-driven-development": "0da347bd34b155ab79cad1e0ee80238f3b4b91b1a17ca0fc2f68460c02224194",
+    "context-engineering": "f4f18514e5eeb162ef9f925dea85af2c72ba79f9b157783a06c39c0bde102d3f",
+    "debugging-and-error-recovery": "658d96f63d56946214a7ec87be0347c78d6024a18f6481dc9f7310638f403629",
+    "deprecation-and-migration": "388d5e7e549f1b728213f0f50d91e9ca96210e0cb23fd9fccd30755268dd01f9",
+    "documentation-and-adrs": "6b2a9d19ebbb81570022a89f09b4810eeb0643a48c698989ee27a224f90bc026",
+    "doubt-driven-development": "df8954091f08c14b0e91bf3bf330f43d5a8408c1efe697591b7b0e8448251c71",
+    "frontend-ui-engineering": "323624fe7ec44bdb4fad3c9488e55993119912625fffa20ee5787389da2b600d",
+    "git-workflow-and-versioning": "dd28469b0f294865dbd20d622a9fee5f05ef87ab1599e973fec6d15a16f76e15",
+    "idea-refine": "07eedcfcba98c6c8f6985917830c4b3d93d4e17af05a9b2ca1b8cb54226bc1b9",
+    "incremental-implementation": "d31e04a0d7b07fc7d01e0176aafbba5607f1cfe7a29a634498305d95c2b3bd3b",
+    "interview-me": "62700902b592a4fa28f6f71f2581d4e1dee412ff288eb156ed97fac3db8b4295",
+    "observability-and-instrumentation": "652b9724e431bd7cfd4481bbab31bb079eeab2b5f70ebc04cf66743e37028721",
+    "performance-optimization": "76befb0806caad12322de8fe372d2e984f6e07c393fd8d3658537c92c7e285cf",
+    "planning-and-task-breakdown": "c3bc139dfa7af82e2d11c7cf461bbf923add7d6494d669da98925f77a7671641",
+    "security-and-hardening": "981142e38769394e6e7760250f2dd599dff21a370040f3f141c42507f04ea540",
+    "shipping-and-launch": "02cc76557e581957cb4987a53e03a8d1aa04c72dc735390d52ae4eed3ddeddf9",
+    "source-driven-development": "233bf9f16f5fe0960c988a5feb2efc475b9b24f9e145d960f8c63e44f4f34fde",
+    "spec-driven-development": "e21f25e534ffa3e2de9ac08c40f8d1d90cef17ad55702f83301cbc2a297c2dcb",
+    "test-driven-development": "38f1489687eaa60761522a8e3efaa926b52786b0e1b3c57947a6050c0da340de",
+    "using-agent-skills": "df5d4f61855ac46da3371bad8c05edb8bc9375ba191acc82b0cca257cfec946c"
+  }
+}

package/scripts/validate-brand.cjs

@@ -7,8 +7,16 @@ const path = require('node:path');
 const root = path.resolve(__dirname, '..');
 const brand = require('../rebrand/brand.json');
 const pkg = require('../package.json');
+const upstream = require('../rebrand/upstream.json');
+const { validateCatalog } = require('../rebrand/catalog.cjs');
+validateCatalog(root, upstream);
 function json(relative) { return JSON.parse(fs.readFileSync(path.join(root, relative), 'utf8')); }
 assert.equal(pkg.name, brand.npmName);
+assert.equal(pkg.version, brand.releaseVersion);
+assert.equal(brand.upstreamCommit, upstream.upstreamCommit);
+assert.equal(pkg.i3ComposerAgent.upstreamVersion, upstream.upstreamVersion);
+assert.equal(pkg.i3ComposerAgent.upstreamCommit, upstream.upstreamCommit);
+assert.equal(pkg.i3ComposerAgent.upstreamRepository, brand.upstream);
 assert.equal(Object.keys(pkg.bin).length, 1, 'npx must resolve one executable');
 assert.ok(fs.existsSync(path.join(root, pkg.bin[brand.name])));
 for (const relative of ['plugin.json', '.claude-plugin/plugin.json', '.codex-plugin/plugin.json']) {
@@ -22,10 +30,10 @@ for (const relative of ['.claude-plugin/marketplace.json', '.agents/plugins/mark
 }
 assert.ok(json('.codex-plugin/plugin.json').interface.shortDescription.length <= 30);
 const skills = fs.readdirSync(path.join(root, 'skills')).filter(name => fs.existsSync(path.join(root, 'skills', name, 'SKILL.md')));
-assert.equal(skills.length, 25, 'brand conversion must preserve the 25-skill collection');
+assert.equal(skills.length, upstream.skills.length, 'brand conversion must preserve the reviewed upstream skills');
 assert.ok(skills.includes('using-agent-skills'), 'meta-skill ID must remain stable');
 const commands = fs.readdirSync(path.join(root, '.claude/commands')).filter(name => name.endsWith('.md'));
-assert.equal(commands.length, 9, 'brand conversion must preserve the nine commands');
+assert.equal(commands.length, upstream.commands.length, 'brand conversion must preserve the reviewed upstream commands');
 for (const command of commands) {
   const body = fs.readFileSync(path.join(root, '.claude/commands', command), 'utf8');
   assert.ok(!body.includes('agent-skills:'), `${command}: stale plugin namespace`);
@@ -33,4 +41,4 @@ for (const command of commands) {
 }
 for (const relative of pkg.i3ComposerAgent.pluginFiles) assert.ok(fs.existsSync(path.join(root, relative)), `bundle is missing ${relative}`);
 assert.match(fs.readFileSync(path.join(root, 'LICENSE'), 'utf8'), /Copyright \(c\) 2025 Addy Osmani/);
-console.log('Brand identity, package entrypoint, 25 skills, nine commands, and upstream attribution are consistent.');
+console.log('Brand identity, package entrypoint, reviewed upstream catalog, and attribution are consistent.');

package/tests/bundle.test.cjs

@@ -7,6 +7,7 @@ const os = require('node:os');
 const path = require('node:path');
 const { spawnSync } = require('node:child_process');
 const root = path.resolve(__dirname, '..');
+const upstream = require('../rebrand/upstream.json');
 const cli = path.join(root, 'bin/i3-composer-agent.cjs');
 function run(args) { return spawnSync(process.execPath, [cli, ...args], { encoding: 'utf8' }); }
 function workspace(t) {
@@ -15,7 +16,10 @@ function workspace(t) {
   return directory;
 }
 test('help and version identify the package without preparing files', () => {
-  assert.match(run(['--help']).stdout, /@givolt\/i3-composer-agent/);
+  const help = run(['--help']).stdout;
+  assert.match(help, /@givolt\/i3-composer-agent/);
+  assert.ok(help.includes(`i3 Composer Agent v${require('../package.json').version}`));
+  assert.ok(help.includes(`Based on agent-skills v${upstream.upstreamVersion}`));
   assert.equal(run(['--version']).stdout.trim(), require('../package.json').version);
 });
 test('dry run and invalid arguments leave the target untouched', t => {
@@ -30,10 +34,12 @@ test('complete bundle preserves reference links and all host assets at a path wi
   const target = path.join(workspace(t), 'plugin with spaces');
   const result = run(['--codebuddy', '--dir', target]);
   assert.equal(result.status, 0, result.stderr);
+  assert.ok(result.stdout.includes(`i3 Composer Agent v${require('../package.json').version}`));
+  assert.ok(result.stdout.includes(`Based on agent-skills v${upstream.upstreamVersion}`));
   assert.match(result.stdout, /\/plugin install i3-composer-agent@i3-composer-agent/);
-  assert.equal(fs.readdirSync(path.join(target, 'skills')).length, 25);
-  assert.equal(fs.readdirSync(path.join(target, '.claude/commands')).length, 9);
-  assert.equal(fs.readdirSync(path.join(target, 'agents')).filter(name => name.endsWith('.md')).length, 4);
+  assert.equal(fs.readdirSync(path.join(target, 'skills')).length, upstream.skills.length);
+  assert.equal(fs.readdirSync(path.join(target, '.claude/commands')).length, upstream.commands.length);
+  assert.equal(fs.readdirSync(path.join(target, 'agents')).filter(name => name.endsWith('.md')).length, upstream.personas.length);
   assert.equal(JSON.parse(fs.readFileSync(path.join(target, '.codex-plugin/plugin.json'), 'utf8')).name, 'i3-composer-agent');
   const check = spawnSync(process.execPath, [path.join(target, 'scripts/validate-reference-links.js')], { cwd: target, encoding: 'utf8' });
   assert.equal(check.status, 0, check.stdout + check.stderr);
@@ -57,7 +63,7 @@ test('installed packages beneath node_modules remain fully extractable', t => {
   const result = spawnSync(process.execPath, [path.join(installed, 'bin/i3-composer-agent.cjs'), '--extract', '--dir', target], { encoding: 'utf8' });
   assert.equal(result.status, 0, result.stderr);
   assert.equal(JSON.parse(fs.readFileSync(path.join(target, 'package.json'), 'utf8')).name, '@givolt/i3-composer-agent');
-  assert.equal(fs.readdirSync(path.join(target, 'skills')).length, 25);
+  assert.equal(fs.readdirSync(path.join(target, 'skills')).length, upstream.skills.length);
 });
 test('replacement preserves the complete previous bundle in a backup', t => {
   const parent = workspace(t);