dojocho 1.0.0 → 1.0.1

package/README.md

@@ -17,7 +17,7 @@ After install, the CLI is available as `dojo`.
 ## Usage
 
 ```sh
-dojo setup --claude       # set up your dojo (creates dojo.config.ts, wires up your agent)
+dojo setup                # set up your dojo (auto-detects your agent via env vars)
 dojo add effect-ts        # install a training pack (a "dojo")
 claude /kata              # start practicing
 ```

package/dist/index.js

@@ -792,9 +792,9 @@ function markDone(root2) {
 }
 
 // src/commands/setup.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync3, lstatSync, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync6, mkdirSync as mkdirSync3, lstatSync, unlinkSync, writeFileSync as writeFileSync3, symlinkSync } from "fs";
 import { execSync as execSync3 } from "child_process";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve5, relative as relative4 } from "path";
 
 // src/pm.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
@@ -837,26 +837,26 @@ function pmCommands(root2) {
     case "pnpm":
       return {
         name: pm,
-        installSilent: "pnpm install --ignore-workspace --silent",
+        installSilent: "pnpm install --ignore-workspace --reporter=append-only",
         add: (pkg) => `pnpm add ${pkg}`
       };
     case "yarn":
       return {
         name: pm,
-        installSilent: "yarn install --silent",
+        installSilent: "yarn install",
         add: (pkg) => `yarn add ${pkg}`
       };
     case "bun":
       return {
         name: pm,
-        installSilent: "bun install --silent",
+        installSilent: "bun install",
         add: (pkg) => `bun add ${pkg}`
       };
     case "npm":
     default:
       return {
         name: pm,
-        installSilent: "npm install --silent",
+        installSilent: "npm install --no-progress",
         add: (pkg) => `npm install ${pkg}`
       };
   }
@@ -864,11 +864,18 @@ function pmCommands(root2) {
 
 // src/commands/setup.ts
 var AGENTS = {
-  claude: { dir: ".claude", hasSettings: true },
-  opencode: { dir: ".opencode", hasSettings: false },
-  codex: { dir: ".codex", hasSettings: false },
-  gemini: { dir: ".gemini", hasSettings: false }
+  claude: { dir: ".claude", commandsDir: "commands", hasSettings: true, envVars: ["CLAUDECODE"] },
+  opencode: { dir: ".opencode", commandsDir: "commands", hasSettings: false, envVars: ["OPENCODE"] },
+  codex: { dir: ".codex", commandsDir: "commands", hasSettings: false, envVars: ["CODEX_THREAD_ID"] },
+  gemini: { dir: ".gemini", commandsDir: "commands", hasSettings: false, envVars: ["GEMINI_CLI"] },
+  pi: { dir: ".pi", commandsDir: "prompts", hasSettings: false, envVars: ["PI_CODING_AGENT"] }
 };
+var AGENTS_COMMANDS_DIR = ".agents/commands";
+function detectAgentsFromEnv() {
+  return Object.keys(AGENTS).filter(
+    (a) => AGENTS[a].envVars.some((v) => Boolean(process.env[v]))
+  );
+}
 var CLAUDE_SETTINGS = {
   permissions: {
     allow: [
@@ -886,28 +893,6 @@ var DEFAULT_DOJO_MD = `!\`dojo $ARGUMENTS\`
 
 Follow any \`<dojo:prompt>\` instructions in the output.
 `;
-var DEFAULT_KATA_MD = `!\`dojo status\`
-
-## Protocol
-
-CLI output uses XML tags to separate directives from student content:
-
-- \`<dojo:status>\` \u2014 Machine state. Parse the \`run:\` line and execute it.
-- \`<dojo:prompt>\` \u2014 Interaction spec. Follow the instructions inside.
-- \`<dojo:sensei>\` \u2014 Teaching material. Internalize but never show verbatim.
-- \`<dojo:learnings>\` \u2014 Prior student observations. Use to personalize teaching.
-- **Unwrapped text** \u2014 Student-facing. Display as-is.
-
-## Flow
-
-1. Parse \`<dojo:status>\` above.
-2. If state is \`complete\`, congratulate the student.
-3. If state is \`no-dojo\`, tell them to run \`dojo add <source>\`.
-4. Otherwise, execute the \`run:\` command.
-5. After running, follow any \`<dojo:prompt>\` instructions.
-6. Use \`<dojo:sensei>\` content to guide teaching \u2014 never paste it to the student.
-7. If \`<dojo:learnings>\` is present, use it to personalize teaching based on prior observations.
-`;
 var DEFAULT_KATA_MD_CLAUDE = `!\`dojo status\`
 
 ## Identity
@@ -973,14 +958,16 @@ function setup(root2, args2) {
   const explicit = Object.keys(AGENTS).filter(
     (a) => args2.includes(`--${a}`)
   );
-  if (explicit.length === 0) {
+  const detected = explicit.length > 0 ? explicit : detectAgentsFromEnv();
+  if (detected.length === 0) {
     promptAgents();
     return;
   }
   scaffold2(root2);
-  setupAgents(root2, explicit);
-  const kataCmd = explicit.length === 1 ? `${explicit[0]} "/kata"` : "/kata in your agent prompt";
-  console.log(`Dojo ready.
+  setupAgents(root2, detected);
+  const kataCmd = detected.length === 1 ? `${detected[0]} "/kata"` : "/kata in your agent prompt";
+  const suffix = explicit.length === 0 ? ` (detected from env: ${detected.join(", ")})` : "";
+  console.log(`Dojo ready${suffix}.
 
   Add a dojo with: ${CLI} add <source>
   Then use:        ${kataCmd}`);
@@ -990,7 +977,8 @@ function promptAgents() {
     `- "Claude Code" \u2192 --claude`,
     `- "OpenCode" \u2192 --opencode`,
     `- "Codex" \u2192 --codex`,
-    `- "Gemini CLI" \u2192 --gemini`
+    `- "Gemini CLI" \u2192 --gemini`,
+    `- "Pi" \u2192 --pi`
   ].join("\n");
   console.log(prompt(`${invokeAsk("multiSelect")} to ask the student:
 Which coding agents do you use?
@@ -1041,32 +1029,46 @@ function scaffold2(root2) {
   }
   const pm = pmCommands(root2);
   console.log("Installing @dojocho/config...");
-  execSync3(pm.add("@dojocho/config"), { cwd: root2, stdio: "pipe" });
+  try {
+    execSync3(pm.add("@dojocho/config"), { cwd: root2, stdio: "pipe" });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    const firstLine = msg.split("\n").find((l) => l.includes("ERR_") || l.includes("error")) ?? msg.split("\n")[0];
+    console.warn(`! Could not install @dojocho/config: ${firstLine.trim()}`);
+    console.warn(`  Continuing setup. Install it manually later (e.g. when authoring katas):`);
+    console.warn(`    ${pm.add("@dojocho/config")}`);
+  }
+}
+function symlinkCanonical(root2, agent, name) {
+  const cfg = AGENTS[agent];
+  const targetDir = resolve5(root2, cfg.dir, cfg.commandsDir);
+  const target = resolve5(targetDir, `${name}.md`);
+  const canonical = resolve5(root2, AGENTS_COMMANDS_DIR, `${name}.md`);
+  try {
+    lstatSync(target);
+    unlinkSync(target);
+  } catch {
+  }
+  symlinkSync(relative4(targetDir, canonical), target);
+}
+function writeCanonicalCommands(root2) {
+  const canonicalDir = resolve5(root2, AGENTS_COMMANDS_DIR);
+  mkdirSync3(canonicalDir, { recursive: true });
+  const canonicalDojo = resolve5(canonicalDir, "dojo.md");
+  if (!existsSync6(canonicalDojo)) writeFileSync3(canonicalDojo, DEFAULT_DOJO_MD);
+  const canonicalKata = resolve5(canonicalDir, "kata.md");
+  if (!existsSync6(canonicalKata)) writeFileSync3(canonicalKata, DEFAULT_KATA_MD_CLAUDE);
 }
 function setupAgents(root2, agents) {
+  writeCanonicalCommands(root2);
   for (const agent of agents) {
-    const dir = AGENTS[agent].dir;
-    mkdirSync3(resolve5(root2, dir, "commands"), { recursive: true });
-    mkdirSync3(resolve5(root2, dir, "skills"), { recursive: true });
-    const dojoMd = resolve5(root2, dir, "commands", "dojo.md");
-    try {
-      if (lstatSync(dojoMd).isSymbolicLink()) unlinkSync(dojoMd);
-    } catch {
-    }
-    if (!existsSync6(dojoMd)) {
-      writeFileSync3(dojoMd, DEFAULT_DOJO_MD);
-    }
-    const kataMdContent = agent === "claude" ? DEFAULT_KATA_MD_CLAUDE : DEFAULT_KATA_MD;
-    const kataMd = resolve5(root2, dir, "commands", "kata.md");
-    try {
-      if (lstatSync(kataMd).isSymbolicLink()) unlinkSync(kataMd);
-    } catch {
-    }
-    if (!existsSync6(kataMd)) {
-      writeFileSync3(kataMd, kataMdContent);
-    }
-    if (AGENTS[agent].hasSettings) {
-      const settingsPath = resolve5(root2, dir, "settings.json");
+    const cfg = AGENTS[agent];
+    mkdirSync3(resolve5(root2, cfg.dir, cfg.commandsDir), { recursive: true });
+    mkdirSync3(resolve5(root2, cfg.dir, "skills"), { recursive: true });
+    symlinkCanonical(root2, agent, "dojo");
+    symlinkCanonical(root2, agent, "kata");
+    if (cfg.hasSettings) {
+      const settingsPath = resolve5(root2, cfg.dir, "settings.json");
       writeFileSync3(settingsPath, JSON.stringify(CLAUDE_SETTINGS, null, 2) + "\n");
     }
   }
@@ -1078,9 +1080,9 @@ function configuredAgents(root2) {
 }
 
 // src/commands/add.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync4, cpSync, renameSync, unlinkSync as unlinkSync3, symlinkSync, readdirSync as readdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync4, rmSync as rmSync2 } from "fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync4, cpSync, renameSync, unlinkSync as unlinkSync3, symlinkSync as symlinkSync2, readdirSync as readdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync4, rmSync as rmSync2 } from "fs";
 import { execSync as execSync4, execFileSync } from "child_process";
-import { resolve as resolve7, relative as relative4 } from "path";
+import { resolve as resolve7, relative as relative5 } from "path";
 import { tmpdir } from "os";
 
 // src/commands/remove.ts
@@ -1218,7 +1220,15 @@ function installExtracted(root2, extractedDir, source, force) {
   const pkgPath = resolve7(extractedDir, "package.json");
   if (existsSync8(pkgPath)) {
     console.log(`Installing ${name} dependencies...`);
-    execSync4(pm.installSilent, { cwd: extractedDir, stdio: "pipe" });
+    try {
+      execSync4(pm.installSilent, { cwd: extractedDir, stdio: "pipe" });
+    } catch (err) {
+      const e = err;
+      const detail = e.stderr?.toString().trim() || e.stdout?.toString().trim() || e.message || "unknown error";
+      throw new Error(`Failed to install ${name} dependencies via ${pm.name}:
+
+${detail}`);
+    }
   }
   handleExisting(root2, name, force);
   const targetPath = dojoDir(root2, name);
@@ -1318,9 +1328,9 @@ function finalize(root2, name, targetPath) {
     }
   }
   const dojo = loadConfig(root2);
-  const katasInclude = `${relative4(root2, dojo.katasPath)}/**/*.ts`;
+  const katasInclude = `${relative5(root2, dojo.katasPath)}/**/*.ts`;
   const tsconfigPath = resolve7(root2, "tsconfig.json");
-  const extendsPath = `./${relative4(root2, resolve7(targetPath, "tsconfig.json"))}`;
+  const extendsPath = `./${relative5(root2, resolve7(targetPath, "tsconfig.json"))}`;
   writeFileSync4(
     tsconfigPath,
     JSON.stringify(
@@ -1350,7 +1360,7 @@ function symlinkDir(sourceDir, targetDir, filter) {
     if (!filter(entry)) continue;
     const link = resolve7(targetDir, entry.name);
     if (existsSync8(link)) unlinkSync3(link);
-    symlinkSync(relative4(targetDir, resolve7(sourceDir, entry.name)), link);
+    symlinkSync2(relative5(targetDir, resolve7(sourceDir, entry.name)), link);
   }
 }
 function runLifecycleScript(root2, dojoPath, script) {
@@ -1438,6 +1448,55 @@ function status2(root2, _args) {
   }));
 }
 
+// src/commands/ui.ts
+import { existsSync as existsSync9 } from "fs";
+import { spawn } from "child_process";
+import { dirname as dirname4, join } from "path";
+import { fileURLToPath } from "url";
+function ui(_cwd, args2) {
+  const port = process.env.DOJO_UI_PORT ?? "4567";
+  const uiDir = resolveUiDir();
+  if (!uiDir) {
+    console.error("Could not locate apps/ui/. The dojo UI currently requires running");
+    console.error("`dojo` from inside (or near) the dojocho monorepo.");
+    process.exit(1);
+  }
+  console.error(`\u2192 starting dojo UI from ${uiDir}`);
+  console.error(`  http://localhost:${port}
+`);
+  const env = { ...process.env, PORT: port };
+  const child = spawn("pnpm", ["dev", ...args2], {
+    cwd: uiDir,
+    stdio: "inherit",
+    env
+  });
+  child.on("error", (err) => {
+    if (err.code === "ENOENT") {
+      console.error("Could not find `pnpm` on PATH.");
+      console.error("Install pnpm: https://pnpm.io/installation");
+      process.exit(127);
+    }
+    console.error(`Failed to launch UI: ${err.message}`);
+    process.exit(1);
+  });
+  child.on("exit", (code, signal) => {
+    if (signal) process.kill(process.pid, signal);
+    else process.exit(code ?? 0);
+  });
+}
+function resolveUiDir() {
+  const here = fileURLToPath(import.meta.url);
+  let dir = dirname4(here);
+  for (let i = 0; i < 10; i++) {
+    const candidate = join(dir, "apps", "ui");
+    if (existsSync9(join(candidate, "package.json"))) return candidate;
+    const parent = dirname4(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
+
 // src/index.ts
 var [command, ...args] = process.argv.slice(2);
 async function main() {
@@ -1453,6 +1512,8 @@ async function main() {
     remove(findProjectRoot(), args);
   } else if (command === "status") {
     status2(findProjectRoot(), args);
+  } else if (command === "ui") {
+    ui(process.cwd(), args);
   } else {
     root(process.cwd(), [command, ...args].filter(Boolean));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dojocho",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Installable coding dojos that turn your AI agent into a sensei.",
   "keywords": [
     "cli",
@@ -35,18 +35,17 @@
   "bin": {
     "dojo": "./dist/index.js"
   },
-  "scripts": {
-    "build": "tsup",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "prepublishOnly": "pnpm build"
-  },
   "dependencies": {
-    "@dojocho/config": "workspace:*"
+    "@dojocho/config": "0.0.3"
   },
   "devDependencies": {
     "tsup": "^8.0.0",
     "typescript": "^5.7.0",
     "vitest": "^4.0.18"
+  },
+  "scripts": {
+    "build": "tsup",
+    "test": "vitest run",
+    "test:watch": "vitest"
   }
-}
+}