fimo 0.3.3-staging.24 → 0.3.4-staging.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fimo",
-  "version": "0.3.3-staging.24",
+  "version": "0.3.4-staging.26",
   "description": "Fimo CLI - create, deploy, and manage Fimo projects",
   "bin": {
     "fimo": "dist/cli/index.js"
@@ -15,6 +15,7 @@
   ],
   "type": "module",
   "exports": {
+    "./package.json": "./package.json",
     "./ui": {
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.js"

package/scripts/lib/release-core.mjs

@@ -10,8 +10,8 @@
 // governs a bare `npm i -g fimo` with no env set. The sandbox always
 // overrides it via the injected `.env`.
 
-import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 
 import { ALLOWED_API_URLS } from './channels.mjs';
 
@@ -120,3 +120,51 @@ export function computePublishVersion(baseVersion, channel, opts = {}) {
   const n = opts.runId ?? String(Date.now());
   return `${base}-${channel.distTag}.${n}`;
 }
+
+const BUMP_RANK = { patch: 1, minor: 2, major: 3 };
+
+/**
+ * Peek at pending changeset files and compute the version the next
+ * `changeset version` run will produce for `fimo`. Prerelease channels use
+ * this as their base so a staging build advertises the version prod will
+ * actually ship (`0.3.4-staging.26` while 0.3.4 is pending) instead of the
+ * already-released base. No pending changesets (or no .changeset dir) →
+ * base unchanged.
+ *
+ * @param {string} baseVersion - package.json version
+ * @param {string} changesetDir - absolute path to the repo's .changeset dir
+ * @returns {string}
+ */
+export function nextVersionFromChangesets(baseVersion, changesetDir) {
+  let entries;
+  try {
+    entries = readdirSync(changesetDir);
+  } catch {
+    return baseVersion;
+  }
+
+  let maxBump = null;
+  for (const name of entries) {
+    if (!name.endsWith('.md') || name === 'README.md') {
+      continue;
+    }
+    const text = readFileSync(join(changesetDir, name), 'utf8');
+    const frontmatter = text.match(/^---\n([\s\S]*?)\n---/)?.[1] ?? '';
+    const bump = frontmatter.match(/['"]?fimo['"]?\s*:\s*(patch|minor|major)/)?.[1];
+    if (bump && (!maxBump || BUMP_RANK[bump] > BUMP_RANK[maxBump])) {
+      maxBump = bump;
+    }
+  }
+
+  if (!maxBump) {
+    return baseVersion;
+  }
+  const [major, minor, patch] = baseVersion.split('-')[0].split('.').map(Number);
+  if (maxBump === 'major') {
+    return `${major + 1}.0.0`;
+  }
+  if (maxBump === 'minor') {
+    return `${major}.${minor + 1}.0`;
+  }
+  return `${major}.${minor}.${patch + 1}`;
+}

package/scripts/lib/release-core.test.ts

@@ -0,0 +1,81 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { afterEach, describe, expect, it } from 'vitest';
+
+// @ts-expect-error plain mjs module without types
+import { computePublishVersion, nextVersionFromChangesets } from './release-core.mjs';
+
+const stagingChannel = { prerelease: true, distTag: 'staging' };
+const latestChannel = { prerelease: false, distTag: 'latest' };
+
+describe('computePublishVersion', () => {
+  it('returns the base version verbatim for stable channels', () => {
+    expect(computePublishVersion('0.3.3', latestChannel, { runId: '7' })).toBe('0.3.3');
+  });
+
+  it('synthesizes a prerelease version from the run id', () => {
+    expect(computePublishVersion('0.3.3', stagingChannel, { runId: '26' })).toBe('0.3.3-staging.26');
+  });
+
+  it('strips an existing prerelease suffix before synthesizing', () => {
+    expect(computePublishVersion('0.3.3-staging.9', stagingChannel, { runId: '26' })).toBe('0.3.3-staging.26');
+  });
+});
+
+describe('nextVersionFromChangesets', () => {
+  let dir: string;
+
+  afterEach(() => {
+    if (dir) {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
+  function changesetDir(files: Record<string, string>): string {
+    dir = mkdtempSync(join(tmpdir(), 'changesets-'));
+    writeFileSync(join(dir, 'README.md'), '# Changesets\n');
+    for (const [name, frontmatter] of Object.entries(files)) {
+      writeFileSync(join(dir, name), `---\n${frontmatter}\n---\n\nsummary\n`);
+    }
+    return dir;
+  }
+
+  it('returns the base when the directory does not exist', () => {
+    expect(nextVersionFromChangesets('0.3.3', '/nonexistent/.changeset')).toBe('0.3.3');
+  });
+
+  it('returns the base when no changesets are pending', () => {
+    expect(nextVersionFromChangesets('0.3.3', changesetDir({}))).toBe('0.3.3');
+  });
+
+  it('applies a patch bump for pending patch changesets', () => {
+    const d = changesetDir({ 'a.md': "'fimo': patch" });
+    expect(nextVersionFromChangesets('0.3.3', d)).toBe('0.3.4');
+  });
+
+  it('takes the max bump across pending changesets', () => {
+    const d = changesetDir({
+      'a.md': "'fimo': patch",
+      'b.md': "'fimo': minor",
+      'c.md': "'fimo': patch",
+    });
+    expect(nextVersionFromChangesets('0.3.3', d)).toBe('0.4.0');
+  });
+
+  it('handles major bumps and double-quoted package names', () => {
+    const d = changesetDir({ 'a.md': '"fimo": major' });
+    expect(nextVersionFromChangesets('0.3.3', d)).toBe('1.0.0');
+  });
+
+  it('ignores changesets for other packages', () => {
+    const d = changesetDir({ 'a.md': "'@fimo/fimovm': minor" });
+    expect(nextVersionFromChangesets('0.3.3', d)).toBe('0.3.3');
+  });
+
+  it('ignores an existing prerelease suffix on the base', () => {
+    const d = changesetDir({ 'a.md': "'fimo': patch" });
+    expect(nextVersionFromChangesets('0.3.3-staging.9', d)).toBe('0.3.4');
+  });
+});

package/scripts/postinstall.mjs

@@ -2,8 +2,9 @@
 // Two paths:
 //
 //  1) GLOBAL install (`npm i -g fimo`, `pnpm add -g fimo`, etc.)
-//     → offer to run `fimo skills install` when the install is interactive;
-//       otherwise print the non-blocking hint.
+//     → print a short, non-blocking hint. We steer users toward
+//       `npx fimo@latest` (always current) and `fimo init`, and don't run any
+//       interactive prompt from a package lifecycle script.
 //
 //  2) LOCAL / project install (`pnpm install` in a project that has `fimo`
 //     in its dependencies)
@@ -17,20 +18,18 @@
 //       never break the user's install).
 //
 // pnpm caveat: by default, pnpm strips build scripts from non-approved deps.
-// Fimo-controlled installs (`fimo create --install`, sandbox `fimopm install`,
+// Fimo-controlled installs (`fimo init --install`, sandbox `fimopm install`,
 // and E2E helper installs) pass a scoped allow-all-builds flag for pnpm so the
 // fimo postinstall hook can refresh project skills. The template intentionally
 // does not persist allowlists in package.json / pnpm-workspace.yaml because
 // those conflict with sandbox install flags and drift when deps change. npm /
 // yarn run lifecycle scripts by default and need no extra config.
 
-import { spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
-import readline from 'node:readline/promises';
 import { fileURLToPath } from 'node:url';
 
-import { isGlobalInstall, parseYesNo, shouldPromptForGlobalSkills } from './lib/postinstall-onboarding.mjs';
+import { isGlobalInstall } from './lib/postinstall-onboarding.mjs';
 
 const THIS_FILE = fileURLToPath(import.meta.url);
 const CLI_ROOT = path.resolve(path.dirname(THIS_FILE), '..');
@@ -45,22 +44,12 @@ if (isGlobalInstall(process.env)) {
   console.log();
   console.log(`${green('✓')} ${bold('fimo')} installed`);
   console.log();
-  const promptDecision = shouldPromptForGlobalSkills();
-  if (promptDecision.ok) {
-    const shouldInstallSkills = await confirm(`Install Fimo skills for your AI coding tools now? ${dim('[Y/n]')} `);
-    if (shouldInstallSkills) {
-      await runSkillsInstall();
-    } else {
-      console.log();
-      console.log(`  Later: run ${cyan('fimo skills install')} to register Fimo skills.`);
-    }
-  } else {
-    console.log(`  Tip: run ${cyan('fimo skills install')} to register Fimo skills`);
-    console.log(`  for your AI coding tools (Claude Code, Cursor, Codex, ...).`);
-    console.log(`  ${dim('Skip if you don’t use AI tools.')}`);
-  }
+  console.log(`  Tip: run the latest without a global install:`);
+  console.log(`       ${cyan('npx fimo@latest <command>')}`);
   console.log();
-  console.log(`  Next: run ${cyan('fimo login')} when you're ready to connect your Fimo account.`);
+  console.log(`  Get started:`);
+  console.log(`       ${cyan('fimo init')}            ${dim('# sign in, create or link a project')}`);
+  console.log(`       ${cyan('fimo skills install')}  ${dim('# set up skills for your AI coding tools')}`);
   console.log();
   process.exit(0);
 }
@@ -97,36 +86,3 @@ try {
     console.error('[fimo postinstall] sync failed:', err);
   }
 }
-
-async function confirm(message) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  try {
-    const answer = await rl.question(message);
-    return parseYesNo(answer, true);
-  } finally {
-    rl.close();
-  }
-}
-
-async function runSkillsInstall() {
-  const entry = path.join(CLI_ROOT, 'dist', 'cli', 'index.js');
-  if (!fs.existsSync(entry)) {
-    console.log();
-    console.log(`  Run ${cyan('fimo skills install')} after installation finishes.`);
-    return;
-  }
-
-  console.log();
-  const result = spawnSync(process.execPath, [entry, 'skills', 'install', '--yes'], {
-    stdio: 'inherit',
-    env: {
-      ...process.env,
-      FIMO_POSTINSTALL_CHILD: '1',
-    },
-  });
-
-  if (result.error || result.status !== 0) {
-    console.log();
-    console.log(`  Skills were not installed. Run ${cyan('fimo skills install')} to try again.`);
-  }
-}

package/scripts/publish-npm.mjs

@@ -35,6 +35,7 @@ import { resolveChannel } from './lib/channels.mjs';
 import { writeDevReleaseState } from './lib/dev-release-state.mjs';
 import {
   computePublishVersion,
+  nextVersionFromChangesets,
   pinTemplateFimo,
   stripTemplateLockfile,
   writeReleaseJson,
@@ -90,7 +91,12 @@ if (channel.distTag === 'latest' && !isCI && !bootstrap) {
 }
 
 const pkg = JSON.parse(readFileSync(PKG_PATH, 'utf8'));
-const baseVersion = pkg.version;
+// Prerelease channels base off the version the pending changesets will
+// produce at the next production release, so a staging build advertises the
+// version prod will actually ship.
+const baseVersion = channel.prerelease
+  ? nextVersionFromChangesets(pkg.version, resolve(CLI_ROOT, '../../.changeset'))
+  : pkg.version;
 const runId = process.env.GITHUB_RUN_NUMBER;
 const publishVersion = computePublishVersion(baseVersion, channel, { runId });
 

package/templates/react-router/package.json

@@ -21,7 +21,7 @@
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
-    "fimo": "0.3.3-staging.24",
+    "fimo": "0.3.4-staging.26",
     "input-otp": "^1.4.2",
     "isbot": "^5",
     "lucide-react": "^0.577.0",

package/assets/agents-starter/claude/settings.json

@@ -1,19 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(fimo:*)",
-      "Bash(npx fimo:*)",
-      "Bash(pnpm:*)",
-      "Bash(pnpm dlx:*)",
-      "Bash(npx:*)",
-      "Bash(git status)",
-      "Bash(git status:*)",
-      "Bash(git diff)",
-      "Bash(git diff:*)",
-      "Bash(git log:*)",
-      "Bash(git add:*)",
-      "Bash(git restore:*)",
-      "Bash(mkdir:*)"
-    ]
-  }
-}

package/assets/skills/fimo-cli/references/create.md

@@ -1,90 +0,0 @@
-# `fimo create`
-
-Scaffold a new Fimo project linked to a remote on the Fimo platform.
-
-## Command
-
-```bash
-fimo create [dir] [options]
-```
-
-| Flag                         | Required       | Purpose                                                                                                                              |
-| ---------------------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
-| `[dir]` positional           | yes in non-TTY | Target directory (e.g. `my-site`)                                                                                                    |
-| `--org <id>`                 | yes in non-TTY | Target organization **id** (use the `ID` column from `fimo orgs list`, NOT the slug). Picker shown interactively if omitted and TTY. |
-| `--install` / `--no-install` | yes in non-TTY | Run `pnpm install` after scaffolding (or skip it).                                                                                   |
-| `--agents <list>`            | yes in non-TTY | Comma-separated agent IDs (e.g. `claude-code,cursor`). Pass `none` to write only universal AGENTS.md.                                |
-| `-a, --agent <id>`           | alternative    | Repeatable form: `-a claude-code -a cursor`.                                                                                         |
-| `--template-root <path>`     | no             | Override the bundled template (development only).                                                                                    |
-
-Without the required flags in a non-TTY shell, the command exits with `Cannot prompt in a non-interactive shell.`
-
-For `--agents`, pass the AI tool you're running in: `--agents=claude-code` for Claude Code, `--agents=cursor` for Cursor, `--agents=codex` for Codex, etc. When the flag is omitted, env-var detection of the invoking harness (e.g. `CLAUDECODE` / `CLAUDE_CODE_ENTRYPOINT` → claude-code) auto-targets that agent; other agents must be selected explicitly via `--agents`/`-a` or the interactive picker.
-
-## What gets written
-
-`fimo create` scaffolds:
-
-- The project template (Vite + React 19 + TypeScript + Tailwind v4 + shadcn/ui + react-router)
-- `.fimo.settings.json` — links this directory to the remote project (read-only after creation)
-- `.env` — initial env vars (currently just `VITE_API_URL`)
-- `AGENTS.md` — project rules read by all agentskills.io-compatible AI tools (Codex, OpenCode, Aider, etc.)
-- Per-agent variants based on `--agents`:
-  - `claude-code` → `CLAUDE.md` + `.claude/settings.json`
-  - `cursor` → `.cursor/rules/fimo.mdc`
-  - `windsurf` → `.windsurfrules`
-  - `gemini-cli` → `GEMINI.md`
-  - codex / opencode / aider / others → no extra file; AGENTS.md is read natively
-- The project-scope `fimo` skill (npm package surface: schemas, forms, `t()`, `fimo/ui` components) copied into each selected agent's skill dir (`.claude/skills/fimo/`, `.cursor/skills/fimo/`, etc.). Version-locked to the bundled `fimo` package — the installed `SKILL.md` is stamped with `fimoVersion`. Refresh later with `fimo skills sync`. See `references/agent-setup.md`.
-- A git repository with `fimo` as the remote, an initial commit, and an initial push
-
-Codex, OpenCode, Aider, and similar AGENTS.md-native tools work directly off AGENTS.md without a per-agent variant.
-
-`.env` is only the bootstrap app env so local `pnpm dev` works immediately. User-managed public variables are stored with `fimo vars set` and synced into a managed `.env.local` block; hidden values use `fimo secrets set`. See `references/project-vars-and-secrets.md`.
-
-## Right after scaffolding
-
-Set a human-readable display name with `fimo rename "<Name>"`. Infer it from what the user is building (e.g. "Acme Coffee" for a café site, "Jane Doe Portfolio" for a personal site). The default post-`fimo create` name is an auto-generated slug; renaming updates the dashboard label and the SEO `siteName`.
-
-```bash
-cd my-site
-fimo rename "Acme Coffee"
-```
-
-**Then kick off a warm-up deploy in the background** so the sandbox provisions and installs the user's deps (which may differ from the template's baked ones) while you generate code. The first deploy of a project's life pays a ~15-30s provisioning cost; doing it in the background means the user's first interactive deploy lands on a warm sandbox and finishes in ~4-10s instead. See `references/deploy.md` § Warm the sandbox early in a session.
-
-```bash
-fimo deploy -m "chore: init" &
-```
-
-`-m` is the commit message for any files `validate` may codegen — use a sensible conventional-commit string (e.g. `chore: init`, `chore: scaffold`).
-
-## Load the project context
-
-After `fimo create` completes, the project root has:
-
-- `AGENTS.md` (universal) plus the per-agent variant for the AI tool you're running in (e.g. `CLAUDE.md` for Claude Code, `.cursor/rules/fimo.mdc` for Cursor)
-- `.claude/skills/fimo/SKILL.md` (or the equivalent per-agent path) — the project-scope `fimo` skill, version-locked to the installed `fimo` package
-
-**These files came into existence mid-session, so they may not be auto-loaded by the harness.** Explicitly:
-
-1. `cd <project-dir>` — switch into the new project.
-2. `Read` the project rules file: `AGENTS.md` (or `CLAUDE.md` if you're Claude Code).
-3. `Read` the project skill: `.claude/skills/fimo/SKILL.md` (or `.cursor/skills/fimo/SKILL.md` for Cursor, etc.).
-4. From the project skill's "load these references up front" section, batch-read `references/content.md`, `references/forms.md`, `references/assets.md`, `references/labels.md`, `references/locales.md`, `references/ui.md` before generating any significant code.
-
-Once those are in context, generation respects the project's conventions (schemas, `t()`, `fimo/ui` components, asset handling).
-
-## Adding another AI tool to an existing project later
-
-If a teammate joins on a different AI tool (e.g. Cursor) after the project was scaffolded for claude-code only:
-
-```bash
-fimo skills install --agents=cursor       # one command — global skill + project skill + rule file
-```
-
-Run from inside the project. The command detects the project context and wires up everything for the new agent in a single shot. See `references/agent-setup.md`.
-
-## Multi-org accounts
-
-If you belong to a single organization, `fimo create` defaults to it. If you belong to multiple and don't pass `--org`, the CLI shows an interactive picker. For `fimo create`, pass the org **id** (from the `ID` column of `fimo orgs list`) — not the slug. Use `fimo orgs switch --org <id-or-slug>` to set a default for future `fimo create` invocations. See `references/account.md`.