mapples 0.2.0-beta.7 → 0.2.0-beta.9

package/dist/services/agentInstall.js

@@ -1,9 +1,17 @@
-// `--agent claude` / `mapples agent install`: puts the Claude Code bundle
-// (templates/claude) into an app — project-local skills under .claude/skills,
-// the conventions file, a CLAUDE.md pointer, and the read-only MCP entry.
+// `--agent <name>` / `mapples agent install`: puts the agent bundle
+// (templates/agent) into an app — project-local skills, the conventions
+// file, a pointer in the agent's instructions file, and the read-only MCP
+// entry — in the places each agent reads them:
+//
+//   claude  .claude/skills, .claude/mapples.md, CLAUDE.md, .mcp.json
+//   cursor  .cursor/skills, .cursor/mapples.md, AGENTS.md, .cursor/mcp.json
+//   codex   .agents/skills, .agents/mapples.md, AGENTS.md, .codex/config.toml
+//
 // Files the CLI generated are refreshed in place (recognised by their
 // GENERATED header); a file the user edited is never overwritten — it is
 // skipped, or with --force deprecated (`_depr_<ts>_…old`) and regenerated.
+// An instructions file or MCP config the user already has is never rewritten:
+// the pointer line is appended once, the MCP entry is printed for them to add.
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { deprecateFile } from '../merge/deprecate.js';
@@ -12,21 +20,112 @@ import { DEFAULT_COMPONENTS_DIR, DEFAULT_PAGES_DIR, DEFAULT_ROUTES_DIR, } from '
 import { ensureGitignored } from '../project/secret.js';
 import { cliVersion } from '../version.js';
 import { templatesDir } from './scaffold.js';
-export const SUPPORTED_AGENTS = ['claude'];
-/** Validates the `--agent` option; only Claude Code is supported in v1. */
+export const SUPPORTED_AGENTS = ['claude', 'cursor', 'codex'];
+/** `--agent` spellings that name the same agent (ChatGPT's coding agent is Codex). */
+const AGENT_ALIASES = { chatgpt: 'codex' };
+/** The `agent` a lease is started with, per installed agent (Creator labels sessions by it). */
+export const SESSION_AGENTS = ['claude-code', 'cursor', 'codex'];
+export const AGENT_PROFILES = {
+    claude: {
+        name: 'claude',
+        label: 'Claude Code',
+        sessionAgent: 'claude-code',
+        skillsDir: '.claude/skills',
+        conventionsPath: '.claude/mapples.md',
+        designCommand: '/mapples-design',
+        instructions: {
+            file: 'CLAUDE.md',
+            template: 'claude/CLAUDE.md',
+            pointer: '@.claude/mapples.md',
+        },
+        mcp: { file: '.mcp.json', template: 'claude/mcp.json', marker: '"mapples"' },
+        hooks: {
+            file: '.claude/settings.json',
+            template: 'claude/settings.json',
+            marker: 'agent hook prompt',
+        },
+        restart: 'MAPPLES_SECRET=$(cat .mapples/secret) claude',
+    },
+    cursor: {
+        name: 'cursor',
+        label: 'Cursor',
+        sessionAgent: 'cursor',
+        skillsDir: '.cursor/skills',
+        conventionsPath: '.cursor/mapples.md',
+        designCommand: '/mapples-design',
+        instructions: {
+            file: 'AGENTS.md',
+            template: 'agents-md/AGENTS.md',
+            pointer: '- Cursor: read `.cursor/mapples.md`.',
+        },
+        mcp: { file: '.cursor/mcp.json', template: 'cursor/mcp.json', marker: '"mapples"' },
+        hooks: {
+            file: '.cursor/hooks.json',
+            template: 'cursor/hooks.json',
+            marker: 'agent hook prompt',
+        },
+        restart: 'MAPPLES_SECRET=$(cat .mapples/secret) cursor .',
+    },
+    codex: {
+        name: 'codex',
+        label: 'Codex',
+        sessionAgent: 'codex',
+        skillsDir: '.agents/skills',
+        conventionsPath: '.agents/mapples.md',
+        designCommand: '$mapples-design',
+        instructions: {
+            file: 'AGENTS.md',
+            template: 'agents-md/AGENTS.md',
+            pointer: '- Codex: read `.agents/mapples.md`.',
+        },
+        mcp: {
+            file: '.codex/config.toml',
+            template: 'codex/config.toml',
+            marker: '[mcp_servers.mapples]',
+        },
+        hooks: { file: '.codex/hooks.json', template: 'codex/hooks.json', marker: 'agent hook prompt' },
+        restart: 'MAPPLES_SECRET=$(cat .mapples/secret) codex',
+    },
+};
+/** The agent a `--agent` spelling names (aliases resolved), or null. */
+function agentNameOf(value) {
+    if (typeof value !== 'string')
+        return null;
+    const name = value.toLowerCase();
+    if (SUPPORTED_AGENTS.includes(name))
+        return name;
+    return AGENT_ALIASES[name] ?? null;
+}
+/** Validates the `--agent` option; undefined when not given. */
 export function parseAgentName(value) {
     if (value === undefined)
         return undefined;
-    if (value === 'claude')
-        return 'claude';
-    throw new Error(`unknown --agent "${String(value)}" — supported: ${SUPPORTED_AGENTS.join(', ')}`);
+    const name = agentNameOf(value);
+    if (name)
+        return name;
+    throw new Error(`unknown --agent "${String(value)}" — supported: ${SUPPORTED_AGENTS.join(', ')} (chatgpt = codex)`);
+}
+/** Validates `agent start --agent`; the session agent recorded for Creator. */
+export function parseSessionAgent(value) {
+    if (value === undefined)
+        return 'claude-code';
+    if (typeof value === 'string' && SESSION_AGENTS.includes(value)) {
+        return value;
+    }
+    const installed = agentNameOf(value);
+    if (installed)
+        return AGENT_PROFILES[installed].sessionAgent;
+    throw new Error(`unknown session agent "${String(value)}" — supported: ${SESSION_AGENTS.join(', ')}`);
+}
+/** The default session label for a session agent. */
+export function sessionAgentLabel(agent) {
+    return Object.values(AGENT_PROFILES).find((p) => p.sessionAgent === agent).label;
 }
 /** The marker every generated Markdown file carries (line 1, or right after its frontmatter). */
 export const GENERATED_HEADER = /^<!--\s*GENERATED by Mapples\b/;
-export const CLAUDE_MD_POINTER = '@.claude/mapples.md';
 /**
  * Whether the CLI generated this file: the header opens the file, or — for
- * skills, whose YAML frontmatter must be the first thing Claude Code reads —
+ * skills, whose YAML frontmatter must be the first thing the agent reads —
  * it is the first line after the frontmatter block.
  */
 export function isGeneratedFile(content) {
@@ -41,27 +140,40 @@ export function isGeneratedFile(content) {
     const afterFrontmatter = lines.slice(close + 1).find((line) => line.trim() !== '');
     return GENERATED_HEADER.test(afterFrontmatter ?? '');
 }
-export function claudeTemplatesDir() {
-    return join(templatesDir(), 'claude');
+export function agentTemplatesDir() {
+    return join(templatesDir(), 'agent');
 }
-function substitute(content, opts) {
+function substitute(content, profile, opts) {
     return content
         .replaceAll('__CLI_VERSION__', cliVersion())
         .replaceAll('__API_URL__', opts.apiUrl.replace(/\/+$/, ''))
         .replaceAll('__ROUTES_DIR__', opts.routesDir)
         .replaceAll('__PAGES_DIR__', opts.pagesDir)
-        .replaceAll('__COMPONENTS_DIR__', opts.componentsDir);
-}
-export function mcpConfigFor(apiUrl) {
-    return substitute(readFileSync(join(claudeTemplatesDir(), 'mcp.json'), 'utf8'), {
-        apiUrl,
-        force: false,
-        routesDir: '',
-        pagesDir: '',
-        componentsDir: '',
-    });
+        .replaceAll('__COMPONENTS_DIR__', opts.componentsDir)
+        .replaceAll('__SKILLS_DIR__', profile.skillsDir)
+        .replaceAll('__CONVENTIONS_PATH__', profile.conventionsPath)
+        .replaceAll('__DESIGN_COMMAND__', profile.designCommand)
+        .replaceAll('__AGENT_LABEL__', profile.label)
+        .replaceAll('__AGENT_ID__', profile.sessionAgent)
+        .replaceAll('__AGENT_FLAG__', profile.name)
+        .replaceAll('__AGENT_RESTART__', profile.restart)
+        .replaceAll('__AGENTS_MD_POINTER__', profile.instructions.pointer);
 }
-/** Write a generated Markdown file, honouring the header handshake. */
+function resolveOptions(options) {
+    return {
+        apiUrl: options.apiUrl,
+        force: options.force === true,
+        routesDir: options.routesDir ?? DEFAULT_ROUTES_DIR,
+        pagesDir: options.pagesDir ?? DEFAULT_PAGES_DIR,
+        componentsDir: options.componentsDir ?? DEFAULT_COMPONENTS_DIR,
+    };
+}
+/** The agent's MCP config for this API, as the installer writes it. */
+export function mcpConfigFor(agent, apiUrl) {
+    const profile = AGENT_PROFILES[agent];
+    return substitute(readFileSync(join(agentTemplatesDir(), profile.mcp.template), 'utf8'), profile, resolveOptions({ apiUrl }));
+}
+/** Write a generated file, honouring the header handshake. */
 function placeGenerated(root, rel, content, force, outcomes) {
     const abs = join(root, rel);
     if (existsSync(abs)) {
@@ -96,6 +208,30 @@ function placeGenerated(root, rel, content, force, outcomes) {
     writeFileSync(abs, content);
     outcomes.push({ file: rel, action: 'created' });
 }
+/**
+ * A config file the agent reads whole (MCP servers, hooks): created when
+ * absent, left alone when it already carries our entry, and otherwise never
+ * rewritten — the snippet comes back for the user to merge.
+ */
+function placeConfigOnce(root, target, content, outcomes, what) {
+    const abs = join(root, target.file);
+    if (!existsSync(abs)) {
+        mkdirSync(dirname(abs), { recursive: true });
+        writeFileSync(abs, content);
+        outcomes.push({ file: target.file, action: 'created' });
+        return null;
+    }
+    if (readFileSync(abs, 'utf8').includes(target.marker)) {
+        outcomes.push({ file: target.file, action: 'unchanged' });
+        return null;
+    }
+    outcomes.push({
+        file: target.file,
+        action: 'skipped',
+        detail: `exists — add ${what} yourself (snippet printed below)`,
+    });
+    return content;
+}
 function walk(dir, rel = '') {
     const out = [];
     for (const entry of readdirSync(join(dir, rel), { withFileTypes: true })) {
@@ -107,74 +243,67 @@ function walk(dir, rel = '') {
     }
     return out.sort();
 }
-export function installClaudeIntegration(root, options) {
-    const opts = {
-        apiUrl: options.apiUrl,
-        force: options.force === true,
-        routesDir: options.routesDir ?? DEFAULT_ROUTES_DIR,
-        pagesDir: options.pagesDir ?? DEFAULT_PAGES_DIR,
-        componentsDir: options.componentsDir ?? DEFAULT_COMPONENTS_DIR,
-    };
-    const src = claudeTemplatesDir();
+export function installAgentIntegration(root, agent, options) {
+    const profile = AGENT_PROFILES[agent];
+    const opts = resolveOptions(options);
+    const src = agentTemplatesDir();
     const outcomes = [];
-    const read = (rel) => substitute(readFileSync(join(src, rel), 'utf8'), opts);
-    // Skills: templates/claude/skills/** -> .claude/skills/**
+    const read = (rel) => substitute(readFileSync(join(src, rel), 'utf8'), profile, opts);
+    // Skills: templates/agent/skills/** -> <skillsDir>/**
     for (const rel of walk(join(src, 'skills'))) {
-        placeGenerated(root, join('.claude', 'skills', rel), read(join('skills', rel)), opts.force, outcomes);
+        placeGenerated(root, join(profile.skillsDir, rel), read(join('skills', rel)), opts.force, outcomes);
     }
-    // Conventions: templates/claude/mapples.md -> .claude/mapples.md
-    placeGenerated(root, join('.claude', 'mapples.md'), read('mapples.md'), opts.force, outcomes);
-    // CLAUDE.md: created from the template when absent; otherwise only the
-    // pointer line is appended — the user's instructions are theirs.
-    const claudeMd = join(root, 'CLAUDE.md');
-    if (!existsSync(claudeMd)) {
-        writeFileSync(claudeMd, read('CLAUDE.md'));
-        outcomes.push({ file: 'CLAUDE.md', action: 'created' });
+    // Conventions: templates/agent/mapples.md -> <conventionsPath>
+    placeGenerated(root, profile.conventionsPath, read('mapples.md'), opts.force, outcomes);
+    // Instructions file: created from the template when absent; otherwise only
+    // the pointer line is appended — the user's instructions are theirs.
+    const instructions = join(root, profile.instructions.file);
+    const pointer = profile.instructions.pointer;
+    if (!existsSync(instructions)) {
+        writeFileSync(instructions, read(profile.instructions.template));
+        outcomes.push({ file: profile.instructions.file, action: 'created' });
     }
     else {
-        const current = readFileSync(claudeMd, 'utf8');
-        if (current.split('\n').some((line) => line.trim() === CLAUDE_MD_POINTER)) {
-            outcomes.push({ file: 'CLAUDE.md', action: 'unchanged' });
+        const current = readFileSync(instructions, 'utf8');
+        if (current.split('\n').some((line) => line.trim() === pointer)) {
+            outcomes.push({ file: profile.instructions.file, action: 'unchanged' });
         }
         else {
-            writeFileSync(claudeMd, current +
-                (current.endsWith('\n') || current === '' ? '' : '\n') +
-                `\n${CLAUDE_MD_POINTER}\n`);
-            outcomes.push({ file: 'CLAUDE.md', action: 'appended', detail: CLAUDE_MD_POINTER });
+            writeFileSync(instructions, current + (current.endsWith('\n') || current === '' ? '' : '\n') + `\n${pointer}\n`);
+            outcomes.push({ file: profile.instructions.file, action: 'appended', detail: pointer });
         }
     }
-    // .mcp.json: written once; an existing one is never touched (the user may
-    // have other servers there) — the snippet is returned for them to merge.
-    const mcp = join(root, '.mcp.json');
-    let mcpSnippet = null;
-    const mcpContent = read('mcp.json');
-    if (!existsSync(mcp)) {
-        writeFileSync(mcp, mcpContent);
-        outcomes.push({ file: '.mcp.json', action: 'created' });
-    }
-    else if (readFileSync(mcp, 'utf8').includes('"mapples"')) {
-        outcomes.push({ file: '.mcp.json', action: 'unchanged' });
-    }
-    else {
-        mcpSnippet = mcpContent;
-        outcomes.push({
-            file: '.mcp.json',
-            action: 'skipped',
-            detail: 'exists — add the "mapples" server yourself (snippet printed below)',
-        });
-    }
+    // MCP config and lease hooks: written once; an existing file is never
+    // touched (the user may have other servers or hooks there) — the snippet
+    // is returned for them to merge.
+    const mcpSnippet = placeConfigOnce(root, profile.mcp, read(profile.mcp.template), outcomes, 'the "mapples" server');
+    const hooksSnippet = placeConfigOnce(root, profile.hooks, read(profile.hooks.template), outcomes, 'the Mapples lease hooks');
     if (ensureGitignored(root, [AGENT_STATE_GITIGNORE])) {
         outcomes.push({ file: '.gitignore', action: 'appended', detail: AGENT_STATE_GITIGNORE });
     }
-    return { outcomes, mcpSnippet };
+    return { agent, outcomes, mcpSnippet, hooksSnippet };
 }
-/** The lines printed after create/init/install with `--agent claude`. */
-export function claudeNextSteps(appDir) {
+/** The lines printed after create/init/install with `--agent <name>`. */
+export function agentNextSteps(agent, appDir) {
+    const profile = AGENT_PROFILES[agent];
     const cd = appDir ? `cd ${appDir} && ` : '';
+    const where = {
+        claude: 'then type',
+        cursor: 'then in Agent chat type',
+        codex: 'trust the project when Codex asks and approve its hooks with /hooks (they load from .codex/), then type',
+    };
     return [
-        'Claude Code is set up. Start it with the project key in the environment:',
-        `  ${cd}MAPPLES_SECRET=$(cat .mapples/secret) claude`,
-        'then type  /mapples-design  and describe your app.',
+        `${profile.label} is set up. Start it with the project key in the environment:`,
+        `  ${cd}${profile.restart}`,
+        `${where[agent]}  ${profile.designCommand}  and describe your app.`,
     ];
 }
+/** The line that introduces a printed MCP snippet. */
+export function mcpSnippetHeading(agent) {
+    return `Add this to your ${AGENT_PROFILES[agent].mcp.file}:`;
+}
+/** The line that introduces a printed hooks snippet. */
+export function hooksSnippetHeading(agent) {
+    return `Add these hooks to your ${AGENT_PROFILES[agent].hooks.file} (they show the agent as working in Creator):`;
+}
 //# sourceMappingURL=agentInstall.js.map

package/dist/services/agentInstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentInstall.js","sourceRoot":"","sources":["../../src/services/agentInstall.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentInstall.js","sourceRoot":"","sources":["../../src/services/agentInstall.ts"],"names":[],"mappings":"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"}

package/dist/services/scaffold.js

@@ -9,7 +9,7 @@ export function templatesDir() {
 }
 const RENAMES = { gitignore: '.gitignore' };
 /** Template subtrees that are not part of the app shell (installed by their own service). */
-const NOT_APP_SHELL = new Set(['claude']);
+const NOT_APP_SHELL = new Set(['agent']);
 /** Copy the app-shell templates into `target`, substituting __APP_NAME__. Never overwrites. */
 export function scaffoldApp(target, appName) {
     const written = [];

package/dist/services/scaffold.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/services/scaffold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffold.js","sourceRoot":"","sources":["../../src/services/scaffold.ts"],"names":[],"mappings":"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"}

package/dist/services/syncEngine.js

@@ -22,7 +22,7 @@ import { emitComponent, emitPage, withoutRouteMarker } from '../codegen/emit.js'
 import { importNeedsFor } from '../codegen/imports.js';
 import { instanceLinker } from '../codegen/instances.js';
 import { deprecateFile } from '../merge/deprecate.js';
-import { diffTree } from '../merge/diff.js';
+import { diffTree, diffTreeStaged } from '../merge/diff.js';
 import { buildMergePatch, deepEqual } from '../merge/mergePatch.js';
 import { threeWayMerge } from '../merge/threeWay.js';
 import { treeToEdits } from '../merge/toEdits.js';
@@ -122,7 +122,7 @@ export async function runSyncEngine({ root, client }) {
         // Planned before anything is sent: a placement group that cannot fit one
         // transaction stops the push here (RFC-0001 §5.2). `pushOps` is the send
         // order, which is what `progress.committedOps` counts against.
-        const pushTxs = planTransactions(merged.pushOps);
+        const pushTxs = [...planTransactions(merged.pushOps), ...planTransactions(merged.deferredOps)];
         const pushOps = pushTxs.flat();
         // Source text goes out AFTER the node ops (its `$sid`s must be server
         // ids, which the node push mints), as its own transaction(s).
@@ -391,6 +391,7 @@ async function mergeAndWrite(root, client, config, base, remote, report) {
     const pagesMap = readPagesMap(root);
     const componentsMap = readComponentsMap(root);
     const pushOps = [];
+    const deferredOps = [];
     const sourceUploads = new Set();
     const mergedBase = {
         pages: new Map(),
@@ -425,6 +426,7 @@ async function mergeAndWrite(root, client, config, base, remote, report) {
         sourcesOut: mergedBase.sources,
         sourceUploads,
         pushOps,
+        deferredOps,
         report,
     });
     await mergeFiles({
@@ -441,6 +443,7 @@ async function mergeAndWrite(root, client, config, base, remote, report) {
         sourcesOut: mergedBase.sources,
         sourceUploads,
         pushOps,
+        deferredOps,
         report,
     });
     // ---- Non-page entities: style, assets ----
@@ -450,7 +453,7 @@ async function mergeAndWrite(root, client, config, base, remote, report) {
     const assetsResult = await syncAssets(root, client, remote.assets, report);
     pushOps.push(...assetsResult.pushOps);
     mergedBase.assets = assetsResult.mergedAssets;
-    return { pushOps, mergedBase, pagesMap, componentsMap, sourceUploads };
+    return { pushOps, deferredOps, mergedBase, pagesMap, componentsMap, sourceUploads };
 }
 /**
  * The 3-way file merge for one entity kind: extract the file, merge against
@@ -458,7 +461,7 @@ async function mergeAndWrite(root, client, config, base, remote, report) {
  * deprecate on conflict, and collect the ops that push local changes.
  */
 async function mergeFiles(args) {
-    const { root, kind, base, remote, mapping: mappings, linker, emit, mergedOut, baseSources, remoteSources, sourcesOut, sourceUploads, pushOps, report, } = args;
+    const { root, kind, base, remote, mapping: mappings, linker, emit, mergedOut, baseSources, remoteSources, sourcesOut, sourceUploads, pushOps, deferredOps, report, } = args;
     /**
      * The file's text after this sync becomes the next base. It goes to the
      * server when a stored text exists and differs from the file (the file
@@ -712,8 +715,11 @@ async function mergeFiles(args) {
             report.files.push({ file: mapping.file, action: fileExists ? 'regenerated' : 'created' });
         }
         recordSource(id, remoteSource, written, localTextChanged);
-        // Push = local changes rebased onto remote.
-        pushOps.push(...diffTree(remoteRoot, merged));
+        // Push = local changes rebased onto remote. Moves into containers created
+        // by this push go in a later transaction, once those have real ids.
+        const staged = diffTreeStaged(remoteRoot, merged);
+        pushOps.push(...staged.ops);
+        deferredOps.push(...staged.deferred);
         const statePatch = buildMergePatch({ state: remoteStates }, { state: mergedStates });
         if (statePatch !== null) {
             pushOps.push({ op: 'update', entity: kind.entity, id, patch: statePatch });