ctxr-cli 0.36.0 → 0.37.0

package/dist/core/shared-stores.d.ts

@@ -39,6 +39,11 @@ export interface ReadView {
  * it (D5). A store with no mounts gets exactly its own notes and no scopes.
  */
 export declare function listReadView(storeRoot: string, config: StoreConfig): Promise<ReadView>;
+/**
+ * Where a read-view note's file is on disk: a mounted note under its mount's root, which lives in the main
+ * working tree (so not under a linked worktree's root), and anything else under the store's own root.
+ */
+export declare function readViewFilePath(storeRoot: string, view: ReadView, notePath: string): string;
 /** The graph of a store's read view: the one build every caller that writes or compares the persisted graph uses. */
 export declare function buildReadViewGraph(storeRoot: string, config: StoreConfig): Promise<{
     graph: GraphBuildResult;

package/dist/core/shared-stores.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared-stores.d.ts","sourceRoot":"","sources":["../../src/core/shared-stores.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAA0C,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAIvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAElH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GACpG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtG,mGAAmG;AACnG,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAsBjG;AAED,MAAM,WAAW,QAAQ;IACvB,qGAAqG;IACrG,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,kGAAkG;IAClG,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAe5F;AAED,qHAAqH;AACrH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAGrI;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,gBAAgB,EAAE,CAOnF;AAED,MAAM,WAAW,aAAa;IAC5B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAetF"}
+{"version":3,"file":"shared-stores.d.ts","sourceRoot":"","sources":["../../src/core/shared-stores.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAA0C,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAa,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAIvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAElH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GACpG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,GAC9E;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtG,mGAAmG;AACnG,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAsBjG;AAED,MAAM,WAAW,QAAQ;IACvB,qGAAqG;IACrG,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,kGAAkG;IAClG,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAe5F;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI5F;AAED,qHAAqH;AACrH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;IAAE,KAAK,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC,CAGrI;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,GAAG,gBAAgB,EAAE,CAOnF;AAED,MAAM,WAAW,aAAa;IAC5B,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,CAAC;IACpB,6CAA6C;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAetF"}

package/dist/core/shared-stores.js

@@ -55,6 +55,16 @@ export async function listReadView(storeRoot, config) {
     }
     return { notes, scopes, mounts };
 }
+/**
+ * Where a read-view note's file is on disk: a mounted note under its mount's root, which lives in the main
+ * working tree (so not under a linked worktree's root), and anything else under the store's own root.
+ */
+export function readViewFilePath(storeRoot, view, notePath) {
+    const mount = view.mounts.find((m) => m.state === 'present' && notePath.startsWith(`${m.location}/`));
+    if (mount === undefined)
+        return path.join(storeRoot, notePath);
+    return path.join(mount.root, notePath.slice(mount.location.length + 1));
+}
 /** The graph of a store's read view: the one build every caller that writes or compares the persisted graph uses. */
 export async function buildReadViewGraph(storeRoot, config) {
     const view = await listReadView(storeRoot, config);

package/dist/core/shared-stores.js.map

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

package/dist/core/skill-placeholders.d.ts

@@ -0,0 +1,51 @@
+import type { StoreConfig } from '../config/schema.js';
+/**
+ * publish-one-contexture-plugin D2: every value an owned skill's template
+ * takes from one store, as a `__TOKEN__` in the template, with the label the
+ * store-independent MCP render writes in its place (`<inbox path>`) and the
+ * value a store gives it. The one list both readers use: the CLI render
+ * substitutes `value`, the MCP render substitutes the label, and the server
+ * instructions' *This store* section names each label with this store's value,
+ * so a label in a skill and the label the connector answers it with cannot drift.
+ *
+ * The computed blocks (`__LAYER_STEP__`, `__RELATION_GROUPING_STEP__`) are not
+ * here: they are whole steps, rendered from the taxonomy and the relation
+ * vocabulary, and the MCP render points them at the layers and the vocabulary
+ * the instructions list.
+ */
+export interface StorePlaceholder {
+    /** The template token, without its surrounding underscores. */
+    token: string;
+    /** What the MCP render names the value: `<label>`. */
+    label: string;
+    /** This store's value, as the CLI render writes it. */
+    value: (config: StoreConfig) => string;
+    /**
+     * The templates write this token outside a code span, so the MCP render
+     * wraps its label in one: a bare `<label>` is an HTML tag to a markdown reader.
+     */
+    bare?: true;
+}
+/** Where this store's operator-authored conventions live, for a skill to name by path. */
+export declare function houseConventionsPath(config: StoreConfig): string;
+export declare const STORE_PLACEHOLDERS: readonly StorePlaceholder[];
+/** `<label>`, as a skill in the MCP render and the *This store* section both write it. */
+export declare function placeholderName(placeholder: StorePlaceholder): string;
+/**
+ * A token map whose values are computed when a template reads them, so a
+ * render reads only the configuration its templates name (a fixture seed
+ * with a partial configuration renders, as it did before the map existed).
+ */
+export declare function lazyValues(entries: Iterable<readonly [string, () => string]>): Readonly<Record<string, string>>;
+/** The CLI render's entry for each placeholder: its value in this store. */
+export declare function storeValueEntries(config: StoreConfig): (readonly [string, () => string])[];
+/** The token map the MCP render fills a template with: each placeholder's label, and no configuration. */
+export declare function placeholderValues(): Record<string, string>;
+/**
+ * One pass over `__TOKEN__`s, so a value that happens to contain a token is
+ * never substituted again, and a function replacement, so a `$` in a value is
+ * written as it is. A token the map does not name is left in place; the tests
+ * assert that none survives a render.
+ */
+export declare function fillTokens(text: string, values: Readonly<Record<string, string>>): string;
+//# sourceMappingURL=skill-placeholders.d.ts.map

package/dist/core/skill-placeholders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-placeholders.d.ts","sourceRoot":"","sources":["../../src/core/skill-placeholders.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,gBAAgB;IAC/B,+DAA+D;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,uDAAuD;IACvD,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,MAAM,CAAC;IACvC;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;CACb;AAED,0FAA0F;AAC1F,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAEhE;AAED,eAAO,MAAM,kBAAkB,EAAE,SAAS,gBAAgB,EAczD,CAAC;AAEF,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,WAAW,EAAE,gBAAgB,GAAG,MAAM,CAErE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAI/G;AAED,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,MAAM,CAAC,CAAC,EAAE,CAE1F;AAED,0GAA0G;AAC1G,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE1D;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAEzF"}

package/dist/core/skill-placeholders.js

@@ -0,0 +1,55 @@
+import path from 'node:path';
+import { DEFAULT_HOUSE_CONVENTIONS_FILE_NAME, DEFAULT_LOG_PATH, DEFAULT_MISSION_MAX_BYTES, DEFAULT_SCRATCH_PATH } from '../config/defaults.js';
+import { GRAPH_DOCUMENT_RELATIVE_PATH } from './graph/persist.js';
+/** Where this store's operator-authored conventions live, for a skill to name by path. */
+export function houseConventionsPath(config) {
+    return path.join(config.harness.guidance_path, DEFAULT_HOUSE_CONVENTIONS_FILE_NAME).split(path.sep).join('/');
+}
+export const STORE_PLACEHOLDERS = [
+    { token: 'DEFAULT_BRANCH', label: 'default branch', value: (config) => config.git.default_branch },
+    { token: 'INBOX_PATH', label: 'inbox path', value: (config) => config.ingest.inbox_path },
+    { token: 'CAPTURE_ROOT', label: 'capture root', value: (config) => config.ingest.capture_root },
+    { token: 'TEMPLATES_PATH', label: 'templates path', value: (config) => config.templates.path },
+    { token: 'LOG_PATH', label: 'log path', value: (config) => config.organize.log_path ?? DEFAULT_LOG_PATH },
+    { token: 'GRAPH_DOCUMENT_PATH', label: 'graph document', value: () => GRAPH_DOCUMENT_RELATIVE_PATH },
+    { token: 'CLUSTER_DEPTH', label: 'cluster depth', value: (config) => String(config.retrieval.graph.cluster_depth), bare: true },
+    { token: 'MISSION_MAX_BYTES', label: 'mission size limit', value: (config) => String(config.organize.mission_max_bytes ?? DEFAULT_MISSION_MAX_BYTES) },
+    { token: 'HOUSE_CONVENTIONS_PATH', label: 'house conventions path', value: houseConventionsPath },
+    { token: 'ARCHIVE_DESTINATION', label: 'archive destination', value: (config) => config.organize.archive_destination },
+    { token: 'SCRATCH_PATH', label: 'scratch path', value: (config) => config.harness.scratch_path ?? DEFAULT_SCRATCH_PATH },
+    // The shared opening section's session root (publish-one-contexture-plugin D7): `<worktrees path><directory>/`.
+    { token: 'WORKTREES_PATH', label: 'worktrees path', value: (config) => config.session.worktrees_path.replace(/\/*$/, '/') },
+];
+/** `<label>`, as a skill in the MCP render and the *This store* section both write it. */
+export function placeholderName(placeholder) {
+    return `<${placeholder.label}>`;
+}
+/**
+ * A token map whose values are computed when a template reads them, so a
+ * render reads only the configuration its templates name (a fixture seed
+ * with a partial configuration renders, as it did before the map existed).
+ */
+export function lazyValues(entries) {
+    const values = {};
+    for (const [token, compute] of entries)
+        Object.defineProperty(values, token, { enumerable: true, get: compute });
+    return values;
+}
+/** The CLI render's entry for each placeholder: its value in this store. */
+export function storeValueEntries(config) {
+    return STORE_PLACEHOLDERS.map((p) => [p.token, () => p.value(config)]);
+}
+/** The token map the MCP render fills a template with: each placeholder's label, and no configuration. */
+export function placeholderValues() {
+    return Object.fromEntries(STORE_PLACEHOLDERS.map((p) => [p.token, p.bare === true ? `\`${placeholderName(p)}\`` : placeholderName(p)]));
+}
+/**
+ * One pass over `__TOKEN__`s, so a value that happens to contain a token is
+ * never substituted again, and a function replacement, so a `$` in a value is
+ * written as it is. A token the map does not name is left in place; the tests
+ * assert that none survives a render.
+ */
+export function fillTokens(text, values) {
+    return text.replace(/__([A-Z][A-Z0-9_]*?)__/g, (whole, token) => values[token] ?? whole);
+}
+//# sourceMappingURL=skill-placeholders.js.map

package/dist/core/skill-placeholders.js.map

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

package/dist/core/skills.d.ts

@@ -32,12 +32,19 @@ export interface Skill {
     /** Packaged files beside SKILL.md, as relative-path -> content. Empty for a skill that is one file. */
     supportingFiles: ReadonlyMap<string, string>;
 }
+/**
+ * The text each `__TOKEN__` of a skill template takes: one store's values for
+ * the CLI render, the named placeholders for the MCP render
+ * (publish-one-contexture-plugin D2). A seed's body reads nothing else, which
+ * is what lets the MCP render take no configuration.
+ */
+export type SkillValues = Readonly<Record<string, string>>;
 export interface SkillSeed {
     file: string;
     name: string;
     description: string;
-    /** The markdown body below the H1, one entry per line, rendered against the store's config. */
-    body: (config: StoreConfig) => string[];
+    /** The markdown body below the H1, one entry per line, rendered against the values of one render. */
+    body: (values: SkillValues) => string[];
     /**
      * Packaged files beside SKILL.md. Absent for a skill that is one file.
      * circleback-sweep: given the store's config, so a skill whose runner cannot
@@ -63,24 +70,42 @@ export declare function activeSkillSeeds(config: StoreConfig): SkillSeed[];
 export declare const SKILLS: readonly SkillSeed[];
 /**
  * serve-the-session-lifecycle-to-chat-apps D6: the owned skills a chat app's
- * plugin carries, rendered from the same templates as the CLI copies. Left
+ * plugin carries, rendered from the same templates as the CLI copies.
+ * publish-one-contexture-plugin D7: these are the shared skills, one text on
+ * both surfaces: each opens with `templates/skills/_surfaces.md`, in a
+ * store's copy and the plugin's alike, saying which store, whether to work in
+ * a shell or through the store's server, and how a step is done there. Left
  * out: the skills that run local programs (upgrade, second opinion,
  * Circleback), landing (a person lands from the approval page), and the
  * derived-artifacts, organize-audit and publish procedures, whose steps the
  * surface does not offer.
  */
 export declare const MCP_SKILL_FILES: readonly string[];
-/** Which surface a render is for: the store's own skills copies, or the chat-app plugin's (D6). */
-export type SkillTarget = 'cli' | 'mcp';
 /**
- * The owned skills, rendered against one store's configuration. `cli` is what
- * `syncShippedSkills` writes. `mcp` is the included subset, each the CLI
- * render's text unchanged under the one preamble that maps its commands and
- * git steps onto the MCP surface's tools (serve-the-session-lifecycle-to-chat-apps D6).
+ * The values the CLI render fills each template with: this store's value for
+ * every placeholder, the placement step computed from its taxonomy, the
+ * relation-grouping step, and the skills path the Circleback skill's runner
+ * is invoked from.
+ */
+export declare function cliSkillValues(config: StoreConfig): SkillValues;
+/**
+ * publish-one-contexture-plugin D2, revision 3: the values the MCP render fills
+ * each template with, which no store configuration enters. Each store value is
+ * its named placeholder, and the two computed steps are generic text pointing
+ * at the layers and the relation vocabulary the connector's instructions list
+ * under *This store*. Skills the MCP render leaves out (Circleback's runner
+ * path) have no entry, so a token they use cannot reach the plugin.
+ */
+export declare function mcpSkillValues(): SkillValues;
+/** The owned skills, rendered against one store's configuration: what `syncShippedSkills` writes. */
+export declare function renderSkills(config: StoreConfig): Skill[];
+/**
+ * The owned skills a chat app's plugin carries: the shared subset, each the
+ * same text a store's copy is (publish-one-contexture-plugin D7), with every
+ * store value as its placeholder. It takes no configuration, so every store
+ * gets the same text, and the connector's instructions give the values (D2).
  */
-export declare function renderSkills(config: StoreConfig, target?: SkillTarget): Skill[];
-/** `templates/skills/mcp/_preamble.md`, rendered against the store's configuration. */
-export declare function mcpPreamble(config: StoreConfig): string;
+export declare function renderMcpSkills(): Skill[];
 /**
  * entry-doc-generation spec: every skill actually on disk — the contexture-
  * owned ones plus any operator-authored ones. This is what the AGENTS.md

package/dist/core/skills.d.ts.map

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

package/dist/core/skills.js

@@ -3,12 +3,11 @@ import { readdirSync, readFileSync } from 'node:fs';
 import { mkdir, readdir, readFile, rm } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { DEFAULT_CIRCLEBACK_DECLINE_TAG, DEFAULT_HOUSE_CONVENTIONS_FILE_NAME, DEFAULT_LOG_PATH, DEFAULT_MISSION_MAX_BYTES, DEFAULT_SCRATCH_PATH, RELATION_DIRECTEDNESS_NOTE, RELATION_VOCABULARY } from '../config/defaults.js';
+import { DEFAULT_CIRCLEBACK_DECLINE_TAG, RELATION_DIRECTEDNESS_NOTE, RELATION_VOCABULARY } from '../config/defaults.js';
 import { scanDocsDir, SKILL_FILE_NAME } from './conventions.js';
-import { GRAPH_DOCUMENT_RELATIVE_PATH } from './graph/persist.js';
 import { writeFileAtomic } from './fs/atomic.js';
+import { fillTokens, lazyValues, placeholderValues, storeValueEntries } from './skill-placeholders.js';
 import { packagedTemplate } from './templates.js';
-import { GIT_STEP_TOOLS, SESSION_COMMAND_TOOLS, UNAVAILABLE_COMMANDS } from './mcp/tool-map.js';
 /**
  * The canonical skill bodies live as plain markdown under
  * `templates/skills/` — see `templates.ts` for why they are loaded
@@ -60,7 +59,7 @@ export function terminatingLayers(config) {
 export function retiredLayers(config) {
     return config.taxonomy.layers.filter((layer) => RETIRED_PATTERN.test(layer.description));
 }
-function skillDocument(seed, config) {
+function skillDocument(seed, values) {
     const lines = [
         '---',
         `name: ${seed.file}`,
@@ -71,10 +70,15 @@ function skillDocument(seed, config) {
         '',
         `# ${seed.name}`,
         '',
-        ...seed.body(config),
+        ...(MCP_SKILL_FILES.includes(seed.file) ? [fillTokens(packagedTemplate('skills', '_surfaces'), values), ''] : []),
+        ...seed.body(values),
     ];
     return `${lines.join('\n')}\n`;
 }
+/** A body that is its template with every token filled from the render's values. */
+function templateBody(slug) {
+    return (values) => fillTokens(skillTemplate(slug), values).split('\n');
+}
 function joinNames(layers) {
     return layers.map((layer) => `**${layer.name}**`).join(' / ');
 }
@@ -111,11 +115,7 @@ const PLACEMENT = {
     file: 'ctxr-placement',
     name: 'Placement',
     description: 'Choose the right taxonomy layer and location for a new or relocated note in this contexture store, with the reasoning.',
-    body: (config) => skillTemplate('ctxr-placement')
-        .replace('__LAYER_STEP__', placementLayerStep(config).join('\n'))
-        .replaceAll('__TEMPLATES_PATH__', config.templates.path)
-        .replaceAll('__CLUSTER_DEPTH__', String(config.retrieval.graph.cluster_depth))
-        .split('\n'),
+    body: templateBody('ctxr-placement'),
 };
 /**
  * capture-is-an-owned-skill spec: the capture stage's procedure. Named for
@@ -129,26 +129,19 @@ const CAPTURE = {
     file: 'ctxr-capture',
     name: 'Capture',
     description: 'Bring material from outside the store into the inbox as a faithful record carrying its source identity, then hand off to ingest.',
-    body: (config) => skillTemplate('ctxr-capture')
-        .replaceAll('__INBOX_PATH__', config.ingest.inbox_path)
-        .replaceAll('__CAPTURE_ROOT__', config.ingest.capture_root)
-        .split('\n'),
+    body: templateBody('ctxr-capture'),
 };
 const INGEST_ORCHESTRATION = {
     file: 'ctxr-ingest-orchestration',
     name: 'Ingest orchestration',
     description: 'Capture raw material into the inbox, run the dedupe check, read the existing cluster, decide new/update/merge/restructure, and ingest with source identity via the contexture CLI.',
-    body: (config) => skillTemplate('ctxr-ingest-orchestration')
-        .replaceAll('__GRAPH_DOCUMENT_PATH__', GRAPH_DOCUMENT_RELATIVE_PATH)
-        .replaceAll('__TEMPLATES_PATH__', config.templates.path)
-        .replaceAll('__LOG_PATH__', config.organize.log_path ?? DEFAULT_LOG_PATH)
-        .split('\n'),
+    body: templateBody('ctxr-ingest-orchestration'),
 };
 const CONNECTION_FINDING = {
     file: 'ctxr-connection-finding',
     name: 'Connection finding',
     description: 'Traverse the wikilink graph of the store (neighbors, paths, hubs, orphans) to find what a note already connects to.',
-    body: () => skillTemplate('ctxr-connection-finding').replaceAll('__GRAPH_DOCUMENT_PATH__', GRAPH_DOCUMENT_RELATIVE_PATH).split('\n'),
+    body: templateBody('ctxr-connection-finding'),
 };
 /**
  * graph-context-document spec: the proposal skill groups by the CONFIGURED
@@ -176,83 +169,67 @@ const CONNECTION_PROPOSAL = {
     file: 'ctxr-connection-proposal',
     name: 'Connection proposal',
     description: 'Discover the links a note should have, read each candidate before proposing, group by the store relation vocabulary, and write only approved links.',
-    body: (config) => skillTemplate('ctxr-connection-proposal').replace('__RELATION_GROUPING_STEP__', relationGroupingStep().join('\n')).split('\n'),
+    body: templateBody('ctxr-connection-proposal'),
 };
 const ROLLUP = {
     file: 'ctxr-rollup',
     name: 'Rollup',
     description: 'Regenerate the synthesized current-state region of an entity note from every source that references it, with provenance for every fact.',
-    body: () => skillTemplate('ctxr-rollup').split('\n'),
+    body: templateBody('ctxr-rollup'),
 };
 const MISSION = {
     file: 'ctxr-mission',
     name: 'Mission',
     description: "Keep the store's mission core current — the primary mission, the top priorities in rank order with status/purpose/next action, and what is not now — with the back burner, sunset candidates, and open debt in a linked register; propose changes and write only on the operator's confirmation.",
-    body: (config) => skillTemplate('ctxr-mission')
-        .replaceAll('__LOG_PATH__', config.organize.log_path ?? DEFAULT_LOG_PATH)
-        .replaceAll('__MISSION_MAX_BYTES__', String(config.organize.mission_max_bytes ?? DEFAULT_MISSION_MAX_BYTES))
-        .split('\n'),
+    body: templateBody('ctxr-mission'),
 };
 const SUBMIT = {
     file: 'ctxr-submit',
     name: 'Submit',
     description: 'End a working session — re-scan, capture once, hold one unit, validate, and open the reviewed pull request with ctxr session submit, which gates, commits, pushes and writes the generated sections.',
-    body: (config) => skillTemplate('ctxr-submit').replaceAll('__DEFAULT_BRANCH__', config.git.default_branch).split('\n'),
+    body: templateBody('ctxr-submit'),
 };
 const LAND = {
     file: 'ctxr-land',
     name: 'Land',
     description: 'Complete a reviewed session — read pull-request state, merge it with gh, sync the default branch, and reclaim the worktree — every step gated and named explicitly.',
-    body: (config) => skillTemplate('ctxr-land').replaceAll('__DEFAULT_BRANCH__', config.git.default_branch).split('\n'),
+    body: templateBody('ctxr-land'),
 };
 const SESSION_LIFECYCLE = {
     file: 'ctxr-session-lifecycle',
     name: 'Session lifecycle',
     description: 'Start a session worktree, re-scan before any plan, resolve conflicts, sequence multiple pull requests, and reclaim worktrees with the ctxr session commands — the frame ctxr-submit and ctxr-land sit inside.',
-    body: (config) => skillTemplate('ctxr-session-lifecycle').replaceAll('__DEFAULT_BRANCH__', config.git.default_branch).split('\n'),
+    body: templateBody('ctxr-session-lifecycle'),
 };
-/** Where this store's operator-authored conventions live, for a skill to name by path. */
-function houseConventionsPath(config) {
-    return path
-        .join(config.harness.guidance_path, DEFAULT_HOUSE_CONVENTIONS_FILE_NAME)
-        .split(path.sep)
-        .join('/');
-}
 const UPGRADE = {
     file: 'ctxr-upgrade',
     name: 'Upgrade',
     description: 'Upgrade the installed ctxr to the latest published release and re-render this store with it — reading the live version check, refusing a non-global install, gating on the operator, and ordering the package upgrade before the store update.',
-    body: () => skillTemplate('ctxr-upgrade').split('\n'),
+    body: templateBody('ctxr-upgrade'),
 };
 const SESSION_CAPTURE = {
     file: 'ctxr-session-capture',
     name: 'Session capture',
     description: 'At the end of a session, propose in one message both the durable notes it produced and any house convention it earned, with per-item approval, then write only what was approved.',
-    body: (config) => skillTemplate('ctxr-session-capture')
-        .replaceAll('__HOUSE_CONVENTIONS_PATH__', houseConventionsPath(config))
-        .replaceAll('__TEMPLATES_PATH__', config.templates.path)
-        .split('\n'),
+    body: templateBody('ctxr-session-capture'),
 };
 const DERIVED_ARTIFACTS = {
     file: 'ctxr-derived-artifacts',
     name: 'Derived artifacts',
     description: 'Refresh a generated artifact safely — check before build, read the counts back, never hand-edit inside a fence, keep derived files out of content commits.',
-    body: (config) => skillTemplate('ctxr-derived-artifacts').replaceAll('__DEFAULT_BRANCH__', config.git.default_branch).split('\n'),
+    body: templateBody('ctxr-derived-artifacts'),
 };
 const ORGANIZE_AUDIT = {
     file: 'ctxr-organize-audit',
     name: 'Organize audit',
     description: 'Audit store health with ctxr lint (observations) and ctxr doctor (blocking invariants), retire by moving, and classify broken links before fixing them.',
-    body: (config) => skillTemplate('ctxr-organize-audit')
-        .replaceAll('__LOG_PATH__', config.organize.log_path ?? DEFAULT_LOG_PATH)
-        .replaceAll('__ARCHIVE_DESTINATION__', config.organize.archive_destination)
-        .split('\n'),
+    body: templateBody('ctxr-organize-audit'),
 };
 const PUBLISH = {
     file: 'ctxr-publish',
     name: 'Publish',
     description: 'Turn store content into a shareable HTML page for a subtree, note, or entity, resolving its source notes before any content is copied out.',
-    body: () => skillTemplate('ctxr-publish').split('\n'),
+    body: templateBody('ctxr-publish'),
 };
 /**
  * ship-a-cross-model-second-opinion-skill, revised by
@@ -268,7 +245,7 @@ const SECOND_OPINION = {
     file: 'ctxr-second-opinion',
     name: 'Second opinion',
     description: 'Get an independent critique of a plan, or a poll on a taste call, from three different model families run in parallel, and synthesize their answers without running the plan.',
-    body: () => skillTemplate('ctxr-second-opinion').split('\n'),
+    body: templateBody('ctxr-second-opinion'),
 };
 /**
  * research-and-capture-identity: the research method, written against whatever
@@ -280,10 +257,7 @@ const RESEARCH = {
     file: 'ctxr-research',
     name: 'Research',
     description: 'Research a question against real sources and land the findings in the store, with a brief and a findings ledger, several perspectives, source tiers, a contradiction map, and every claim verified against a source you opened before anyone acts on it, using whatever web access the harness provides.',
-    body: (config) => skillTemplate('ctxr-research')
-        .replaceAll('__SCRATCH_PATH__', config.harness.scratch_path ?? DEFAULT_SCRATCH_PATH)
-        .replaceAll('__LOG_PATH__', config.organize.log_path ?? DEFAULT_LOG_PATH)
-        .split('\n'),
+    body: templateBody('ctxr-research'),
 };
 /**
  * circleback-sweep, revised by capture-circleback-is-retrieval: the first
@@ -303,11 +277,7 @@ const CAPTURE_CIRCLEBACK = {
     file: 'ctxr-capture-circleback',
     name: 'Capture from Circleback',
     description: "Retrieve the Circleback meetings this store's tag says it owes, written into the inbox as verbatim records with their identity, then continue with ctxr-capture from step 2.",
-    body: (config) => skillTemplate('ctxr-capture-circleback')
-        .replaceAll('__SKILLS_PATH__', config.harness.skills_path.replace(/\/+$/, ''))
-        .replaceAll('__INBOX_PATH__', config.ingest.inbox_path)
-        .replaceAll('__DEFAULT_BRANCH__', config.git.default_branch)
-        .split('\n'),
+    body: templateBody('ctxr-capture-circleback'),
     supportingFiles: (config) => {
         const files = new Map(skillSupportingFiles('ctxr-capture-circleback'));
         files.set('settings.json', circlebackSettings(config));
@@ -357,7 +327,11 @@ export const SKILLS = [
 ];
 /**
  * serve-the-session-lifecycle-to-chat-apps D6: the owned skills a chat app's
- * plugin carries, rendered from the same templates as the CLI copies. Left
+ * plugin carries, rendered from the same templates as the CLI copies.
+ * publish-one-contexture-plugin D7: these are the shared skills, one text on
+ * both surfaces: each opens with `templates/skills/_surfaces.md`, in a
+ * store's copy and the plugin's alike, saying which store, whether to work in
+ * a shell or through the store's server, and how a step is done there. Left
  * out: the skills that run local programs (upgrade, second opinion,
  * Circleback), landing (a person lands from the approval page), and the
  * derived-artifacts, organize-audit and publish procedures, whose steps the
@@ -377,46 +351,61 @@ export const MCP_SKILL_FILES = [
     RESEARCH,
 ].map((seed) => seed.file);
 /**
- * The owned skills, rendered against one store's configuration. `cli` is what
- * `syncShippedSkills` writes. `mcp` is the included subset, each the CLI
- * render's text unchanged under the one preamble that maps its commands and
- * git steps onto the MCP surface's tools (serve-the-session-lifecycle-to-chat-apps D6).
+ * The values the CLI render fills each template with: this store's value for
+ * every placeholder, the placement step computed from its taxonomy, the
+ * relation-grouping step, and the skills path the Circleback skill's runner
+ * is invoked from.
  */
-export function renderSkills(config, target = 'cli') {
-    const skills = renderSkillSeeds(activeSkillSeeds(config), config);
-    if (target === 'cli')
-        return skills;
-    const preamble = mcpPreamble(config);
-    return skills.filter((skill) => MCP_SKILL_FILES.includes(skill.file)).map((skill) => ({ ...skill, content: withPreamble(skill.content, preamble) }));
+export function cliSkillValues(config) {
+    return lazyValues([
+        ...storeValueEntries(config),
+        ['LAYER_STEP', () => placementLayerStep(config).join('\n')],
+        ['RELATION_GROUPING_STEP', () => relationGroupingStep().join('\n')],
+        ['SKILLS_PATH', () => config.harness.skills_path.replace(/\/+$/, '')],
+    ]);
 }
-/** `templates/skills/mcp/_preamble.md`, rendered against the store's configuration. */
-export function mcpPreamble(config) {
-    // Revision 6: the tables come from the mapping module, never from a second copy here.
-    const commands = [
-        ...Object.entries(SESSION_COMMAND_TOOLS).map(([command, tool]) => `| \`ctxr ${command}\` | \`${tool}\` |`),
-        ...UNAVAILABLE_COMMANDS.map((command) => `| \`ctxr ${command}\` | none |`),
-    ];
-    const gitSteps = Object.entries(GIT_STEP_TOOLS).map(([step, tool]) => `| \`${step}\` | ${tool === null ? 'none' : `\`${tool}\``} |`);
-    return packagedTemplate('skills/mcp', '_preamble')
-        .replace('__COMMAND_TABLE__', ['| Command | Tool |', '| --- | --- |', ...commands].join('\n'))
-        .replace('__GIT_STEP_TABLE__', ['| Git step | Tool |', '| --- | --- |', ...gitSteps].join('\n'))
-        .replaceAll('__WORKTREES_PATH__', config.session.worktrees_path.replace(/\/*$/, '/'));
+/**
+ * publish-one-contexture-plugin D2, revision 3: the values the MCP render fills
+ * each template with, which no store configuration enters. Each store value is
+ * its named placeholder, and the two computed steps are generic text pointing
+ * at the layers and the relation vocabulary the connector's instructions list
+ * under *This store*. Skills the MCP render leaves out (Circleback's runner
+ * path) have no entry, so a token they use cannot reach the plugin.
+ */
+export function mcpSkillValues() {
+    return {
+        ...placeholderValues(),
+        LAYER_STEP: packagedTemplate('skills/mcp', '_layer-step'),
+        RELATION_GROUPING_STEP: packagedTemplate('skills/mcp', '_relation-grouping-step'),
+    };
+}
+/** The owned skills, rendered against one store's configuration: what `syncShippedSkills` writes. */
+export function renderSkills(config) {
+    return renderSkillSeeds(activeSkillSeeds(config), config);
 }
-/** The preamble goes below the frontmatter, which the Agent Skills format requires first, and above the CLI text. */
-function withPreamble(content, preamble) {
-    const end = content.indexOf('\n---\n', 4);
-    if (!content.startsWith('---\n') || end === -1)
-        throw new Error('a rendered skill carries no frontmatter');
-    const head = content.slice(0, end + '\n---\n'.length);
-    const rest = content.slice(head.length).replace(/^\n/, '');
-    return `${head}\n${preamble}\n\n${rest}`;
+/**
+ * The owned skills a chat app's plugin carries: the shared subset, each the
+ * same text a store's copy is (publish-one-contexture-plugin D7), with every
+ * store value as its placeholder. It takes no configuration, so every store
+ * gets the same text, and the connector's instructions give the values (D2).
+ */
+export function renderMcpSkills() {
+    const values = mcpSkillValues();
+    return SKILLS.filter((seed) => MCP_SKILL_FILES.includes(seed.file)).map((seed) => ({
+        file: seed.file,
+        name: seed.name,
+        description: seed.description,
+        content: skillDocument(seed, values),
+        supportingFiles: new Map(),
+    }));
 }
 function renderSkillSeeds(seeds, config) {
+    const values = cliSkillValues(config);
     return seeds.map((seed) => ({
         file: seed.file,
         name: seed.name,
         description: seed.description,
-        content: skillDocument(seed, config),
+        content: skillDocument(seed, values),
         supportingFiles: seed.supportingFiles?.(config) ?? new Map(),
     }));
 }