reladraw 0.23.1 → 0.24.0

package/.claude/skills/reladraw/SKILL.md

@@ -15,7 +15,7 @@ That matters here specifically. You can't see the SVG you produced. With auto-la
 
 ## Check it is installed, and the same version as this skill
 
-This skill teaches reladraw 0.23.1. Once per session, before the first render, run:
+This skill teaches reladraw 0.24.0. Once per session, before the first render, run:
 
 ```
 reladraw --version
@@ -23,7 +23,7 @@ reladraw --version
 
 - **The same:** say nothing.
 - **Older, or `--version` isn't recognized** (it arrived in 0.17.1): the tool is older than this page and will refuse some of what it teaches. Tell the user, and give them `npm install -g reladraw@latest`.
-- **Newer:** this skill is out of date. Tell the user, and give them `reladraw install-skill -g`, which replaces it with the skill that came with their reladraw. Carry on meanwhile; where an error names a replacement spelling, trust the error over this page.
+- **Newer:** this skill is out of date. Tell the user, and give them `reladraw install-skill`, which asks which agents to install for and replaces it with the skill that came with their reladraw. Carry on meanwhile; where an error names a replacement spelling, trust the error over this page.
 
 If `reladraw` isn't installed, `npx reladraw` works without installing, and `npm install -g reladraw` installs it.
 

package/.claude/skills/reladraw/reference/syntax.md

@@ -1,4 +1,4 @@
-# Syntax reference — 0.23.1
+# Syntax reference — 0.24.0
 
 What the language accepts. The changelog at the end lists what changed in each published version; 0.17.0's changes are large, and its entry has a table of every old spelling and what to write instead.
 
@@ -1203,7 +1203,7 @@ reladraw check diagram.reladraw
 | `--no-checks` | print no findings; errors still print |
 | `-v`, `--version` | print the version |
 
-`reladraw install-skill` installs the agent skill that came with this version of reladraw, by running `npx skills add` on it with `--copy`. What follows it goes to `skills`: `-g` to install for every project, `-a claude-code` for one agent.
+`reladraw install-skill` installs the agent skill that came with this version of reladraw, for every project, by running `npx skills add` on it with `--copy`. `--claude` installs it in `~/.claude/skills`, `--agents` in `~/.agents/skills` (Codex and others), and both may be given; with neither, it asks, or, with no terminal to ask in, refuses and names them. For any other agent it prints the `skills` command to run.
 
 The output is a standalone SVG: every picture is drawn into it as path data, never from a font or a linked file. A web page can draw a diagram in place with `<reladraw-diagram>`; see "In a web page" in the README.
 
@@ -1338,6 +1338,10 @@ Designed and absent from the code.
 
 Pre-1.0, so the minor number is where a breaking change goes. Every removal is refused by name with the replacement quoted, rather than dropped in silence: an older file stops with an error saying what to write instead.
 
+**0.24.0**
+
+- **`reladraw install-skill` installs for Claude Code, the `~/.agents` folder, or both, and asks which.** It used to pass everything on to `skills`, which, given no agent, put a copy in the folder of every agent it knows, more than fifty of them, and in the current project unless `-g` was written. It now always installs for every project, in the places `--claude` and `--agents` name; `-a` and the other `skills` options are refused with the `skills` command that does the same, and `-g` is still accepted.
+
 **0.23.1**
 
 - **`reladraw format` no longer fails on a comment between a placement and its bracket**, such as `right of a`, then `// why wide`, then `(gap: wide)` on lines of their own. It stopped with "Cannot read properties of undefined"; it now keeps the comment where it was. Reported in #22.

package/README.md

@@ -77,22 +77,24 @@ Each `<reladraw-diagram>` is replaced by its SVG. Indent the source however suit
 To install a skill to let your agent know how to use reladraw:
 
 ```
-reladraw install-skill -g
+reladraw install-skill
 ```
 
-That installs the skill that came with your copy of reladraw, so it teaches what your reladraw accepts, for every agent you use (Claude Code, Codex, Cursor, Copilot and others), each in its own skills directory. It hands the work to [skills](https://www.npmjs.com/package/skills), and passes on whatever you write after `install-skill`. Leave off `-g` to install it into the current project only. To install it for just one agent, name it with `-a`:
+That installs the skill that came with your copy of reladraw, so it teaches what your reladraw accepts, for every project. It asks where: `~/.claude/skills` for Claude Code, `~/.agents/skills` for Codex and the other agents that read it, or both. To say so without being asked, as when an agent runs it, write `--claude`, `--agents`, or both:
 
 ```
-reladraw install-skill -g -a claude-code
+reladraw install-skill --claude --agents
 ```
 
+For any other agent, it prints the [skills](https://www.npmjs.com/package/skills) command that installs this same skill there.
+
 The skill is a copy, so after upgrading reladraw, run the command again to bring the skill up to date with it.
 
 To install the skill from the main branch instead, which can run ahead of the release on npm, run `npx skills add reladraw/reladraw -g`.
 
 ## Status
 
-Version 0.23.1. Early stage, but works. The parser, layout engine, and SVG renderer are written in TypeScript, with zero runtime dependencies. There is a command-line tool that turns a .reladraw text file into an SVG, and an element that does the same inside a web page.
+Version 0.24.0. Early stage, but works. The parser, layout engine, and SVG renderer are written in TypeScript, with zero runtime dependencies. There is a command-line tool that turns a .reladraw text file into an SVG, and an element that does the same inside a web page.
 
 ## License
 

package/SYNTAX.md

@@ -1,4 +1,4 @@
-# Syntax reference — 0.23.1
+# Syntax reference — 0.24.0
 
 What the language accepts. The changelog at the end lists what changed in each published version; 0.17.0's changes are large, and its entry has a table of every old spelling and what to write instead.
 
@@ -1203,7 +1203,7 @@ reladraw check diagram.reladraw
 | `--no-checks` | print no findings; errors still print |
 | `-v`, `--version` | print the version |
 
-`reladraw install-skill` installs the agent skill that came with this version of reladraw, by running `npx skills add` on it with `--copy`. What follows it goes to `skills`: `-g` to install for every project, `-a claude-code` for one agent.
+`reladraw install-skill` installs the agent skill that came with this version of reladraw, for every project, by running `npx skills add` on it with `--copy`. `--claude` installs it in `~/.claude/skills`, `--agents` in `~/.agents/skills` (Codex and others), and both may be given; with neither, it asks, or, with no terminal to ask in, refuses and names them. For any other agent it prints the `skills` command to run.
 
 The output is a standalone SVG: every picture is drawn into it as path data, never from a font or a linked file. A web page can draw a diagram in place with `<reladraw-diagram>`; see "In a web page" in the README.
 
@@ -1338,6 +1338,10 @@ Designed and absent from the code.
 
 Pre-1.0, so the minor number is where a breaking change goes. Every removal is refused by name with the replacement quoted, rather than dropped in silence: an older file stops with an error saying what to write instead.
 
+**0.24.0**
+
+- **`reladraw install-skill` installs for Claude Code, the `~/.agents` folder, or both, and asks which.** It used to pass everything on to `skills`, which, given no agent, put a copy in the folder of every agent it knows, more than fifty of them, and in the current project unless `-g` was written. It now always installs for every project, in the places `--claude` and `--agents` name; `-a` and the other `skills` options are refused with the `skills` command that does the same, and `-g` is still accepted.
+
 **0.23.1**
 
 - **`reladraw format` no longer fails on a comment between a placement and its bracket**, such as `right of a`, then `// why wide`, then `(gap: wide)` on lines of their own. It stopped with "Cannot read properties of undefined"; it now keeps the comment where it was. Reported in #22.

package/dist/cli.js

@@ -19,7 +19,7 @@ const USAGE = `reladraw — draw a diagram from stated placement
   reladraw format <input.reladraw>... [--check]
   reladraw format - [--check]
   reladraw format --init
-  reladraw install-skill [skills options]
+  reladraw install-skill [--claude] [--agents]
 
   render      draw the diagram to an SVG, and print any findings: places
               where the picture, drawn as written, may not read as meant.
@@ -37,9 +37,10 @@ const USAGE = `reladraw — draw a diagram from stated placement
               default with what it does.
   install-skill
               install the agent skill that came with this version of
-              reladraw, so it teaches what this tool accepts. It runs
-              npx skills add with --copy, and passes on what follows:
-              -g for every project, -a claude-code for one agent.
+              reladraw, so it teaches what this tool accepts, for every
+              project: --claude in ~/.claude/skills, --agents in
+              ~/.agents/skills (Codex and others), or both. With neither,
+              it asks.
 
   -o, --out   where render writes the SVG. Defaults to the input path with
               its extension replaced by .svg. Use - for standard output.
@@ -62,17 +63,113 @@ const USAGE = `reladraw — draw a diagram from stated placement
 const COMMANDS = ['render', 'check', 'format', 'install-skill'];
 // The version of skills this was tried with, so a change there can't break it.
 const SKILLS_PACKAGE = 'skills@1.7.6';
+// The two places the skill is installed, each picked by its flag. skills
+// knows a folder by an agent that reads it: ~/.agents/skills is its "codex",
+// and other agents read it too. Left to itself, skills installs for every
+// agent it knows of, more than fifty, so the agents are always named.
+const SKILL_TARGETS = [
+    { flag: '--claude', agent: 'claude-code', label: 'Claude Code', dir: '~/.claude/skills' },
+    { flag: '--agents', agent: 'codex', label: 'Codex and others', dir: '~/.agents/skills' },
+];
+function ownVersion() {
+    // package.json ships beside dist/, so the number is the installed one.
+    return JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version;
+}
+// For any other agent, or a single project, skills is run by hand on this
+// install's skill, so it still matches this reladraw.
+function skillsCommand(skills, agent = '<agent>') {
+    const path = /\s/.test(skills) ? JSON.stringify(skills) : skills;
+    return `npx ${SKILLS_PACKAGE} add ${path} --copy -g -a ${agent}`;
+}
+const NAME_THE_TARGETS = SKILL_TARGETS.map((t) => `${t.flag} (${t.dir}, for ${t.label})`).join(', ') + ', or both';
+// In a terminal, a bare install-skill asks; otherwise, as when an agent runs
+// it, the flags must say, because there is no one to ask.
+async function askTargets(skills) {
+    const { createInterface } = await import('node:readline/promises');
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    const closed = new Promise((done) => rl.once('close', () => done(undefined)));
+    const both = SKILL_TARGETS.length + 1;
+    process.stdout.write(`Install the reladraw ${ownVersion()} skill for which agents?\n` +
+        SKILL_TARGETS.map((t, i) => `  ${i + 1}  ${t.label.padEnd(17)} ${t.dir}\n`).join('') +
+        `  ${both}  both\n  ${both + 1}  another agent\n`);
+    try {
+        for (;;) {
+            const answer = await Promise.race([rl.question(`Choose [${both}]: `), closed]);
+            if (answer === undefined) {
+                process.stdout.write('\n');
+                return undefined;
+            }
+            const n = Number(answer.trim() || both);
+            if (n >= 1 && n <= SKILL_TARGETS.length)
+                return [SKILL_TARGETS[n - 1].agent];
+            if (n === both)
+                return SKILL_TARGETS.map((t) => t.agent);
+            if (n === both + 1)
+                return 'other';
+            process.stdout.write(`Type a number from 1 to ${both + 1}.\n`);
+        }
+    }
+    finally {
+        rl.close();
+    }
+}
 // The skill ships in the package beside dist/, as the one in the repository.
-// skills does the work of knowing where each agent keeps its skills; --copy
-// because an npx run leaves the package in a cache, where a link would break.
-function installSkill(args) {
+// skills does the work of copying it in; --copy because an npx run leaves the
+// package in a cache, where a link would break.
+async function installSkill(args) {
     const skills = fileURLToPath(new URL('../.claude/skills/', import.meta.url));
     if (!existsSync(skills)) {
         process.stderr.write(`reladraw: the skill isn't in this install of reladraw (looked in ${skills})\n`);
         return 1;
     }
+    let agents = [];
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        const target = SKILL_TARGETS.find((t) => t.flag === arg);
+        if (target) {
+            if (!agents.includes(target.agent))
+                agents.push(target.agent);
+        }
+        else if (arg === '-g' || arg === '--global') {
+            // Always global now; skills from before 0.24 tell the user to write -g.
+        }
+        else if (arg === '-h' || arg === '--help') {
+            process.stdout.write(`reladraw install-skill [--claude] [--agents]\n\n` +
+                `Installs the skill that came with reladraw ${ownVersion()}, for every project:\n` +
+                SKILL_TARGETS.map((t) => `  ${t.flag.padEnd(9)} ${t.dir}, for ${t.label}\n`).join('') +
+                `With neither, it asks. For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 0;
+        }
+        else if (arg === '-a' || arg === '--agent') {
+            const agent = args[i + 1];
+            process.stderr.write(`reladraw: install-skill takes ${NAME_THE_TARGETS}, not -a. ` +
+                `For ${agent ? `the agent ${agent}` : 'another agent'}, run:\n  ${skillsCommand(skills, agent)}\n`);
+            return 1;
+        }
+        else {
+            process.stderr.write(`reladraw: install-skill doesn't take ${arg}; it takes ${NAME_THE_TARGETS}. ` +
+                `For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 1;
+        }
+    }
+    if (agents.length === 0) {
+        if (!process.stdin.isTTY || !process.stdout.isTTY) {
+            process.stderr.write(`reladraw: say which agents to install the skill for: ${NAME_THE_TARGETS}. ` +
+                `For another agent, run:\n  ${skillsCommand(skills)}\n`);
+            return 1;
+        }
+        const picked = await askTargets(skills);
+        if (picked === undefined)
+            return 1;
+        if (picked === 'other') {
+            process.stdout.write(`For another agent, run this, with its name from skills' list:\n  ${skillsCommand(skills)}\n`);
+            return 0;
+        }
+        agents = picked;
+    }
     const windows = process.platform === 'win32';
-    const command = [SKILLS_PACKAGE, 'add', skills, '--copy', ...args];
+    // -y because the choice is already made; skills would otherwise ask again.
+    const command = [SKILLS_PACKAGE, 'add', skills, '--copy', '-g', '-y', '-a', ...agents];
     // On Windows npx is a .cmd, which Node runs only through a shell.
     const result = spawnSync(windows ? 'npx.cmd' : 'npx', windows ? command.map((a) => `"${a}"`) : command, {
         stdio: 'inherit',
@@ -85,7 +182,7 @@ function installSkill(args) {
     return result.status ?? 1;
 }
 async function main(argv) {
-    // Everything after install-skill is for skills, -h and -v included.
+    // install-skill reads its own flags, -h included.
     if (argv[0] === 'install-skill')
         return installSkill(argv.slice(1));
     if (argv.length === 0 || argv.includes('-h') || argv.includes('--help')) {
@@ -93,9 +190,7 @@ async function main(argv) {
         return argv.length === 0 ? 1 : 0;
     }
     if (argv.includes('-v') || argv.includes('--version')) {
-        // package.json ships beside dist/, so the number is the installed one.
-        const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
-        process.stdout.write(`${pkg.version}\n`);
+        process.stdout.write(`${ownVersion()}\n`);
         return 0;
     }
     const verb = argv[0];
@@ -420,7 +515,7 @@ function nearestSettings(folder, found) {
 // The exit code is set, not exited with: process.exit ends the process at
 // once, and a write to a pipe that hasn't drained yet is lost, which cut
 // `format -` and `render -o -` off at 64 KB. Node exits on its own once the
-// output is written. `./dev.sh pipe` checks it.
+// output is written.
 main(process.argv.slice(2)).then((code) => {
     process.exitCode = code;
 }, (error) => {

package/dist/constants.d.ts

@@ -93,7 +93,7 @@ export declare const DEFAULT_FONT_SIZE = 14;
  * `small` is sampled rather than chosen. In
  * `examples/reference/arch.png` the box and container texts run 25
  * pixels baseline to baseline and every annotation runs 21, which is this
- * ratio; `./dev.sh textrows` is how that was read off. `large` is the same step
+ * ratio. `large` is the same step
  * taken the other way, so the scale is symmetric about the document size.
  */
 export declare const TEXT_SIZES: Record<string, number>;

package/dist/constants.js

@@ -111,7 +111,7 @@ export const DEFAULT_FONT_SIZE = 14;
  * `small` is sampled rather than chosen. In
  * `examples/reference/arch.png` the box and container texts run 25
  * pixels baseline to baseline and every annotation runs 21, which is this
- * ratio; `./dev.sh textrows` is how that was read off. `large` is the same step
+ * ratio. `large` is the same step
  * taken the other way, so the scale is symmetric about the document size.
  */
 export const TEXT_SIZES = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reladraw",
-  "version": "0.23.1",
+  "version": "0.24.0",
   "description": "A diagram language where you say where things go.",
   "type": "module",
   "bin": {
@@ -35,7 +35,6 @@
   "scripts": {
     "build": "tsc && tsc -p tsconfig.element.json",
     "prepublishOnly": "npm run build",
-    "preversion": "./dev.sh check-version \"$npm_new_version\"",
     "dev": "tsc --watch",
     "example": "npm run build && node dist/cli.js render examples/arch.reladraw -o examples/out/arch.svg"
   },