@nowline/cli 0.9.0 → 0.11.0

package/dist/diagnostics/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/diagnostics/text.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/diagnostics/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,UAAU,UAAU,CACtB,WAA4B,EAC5B,OAAsC,EACtC,OAAO,GAAsB,EAAE;IAE/B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAClF,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CACd,IAAmB,EACnB,MAAoC,EACpC,QAAiB;IAEjB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC3B,MAAM,KAAK,GAAG,gBAAgB,CAC1B,MAAM,CAAC,QAAQ,EACf;QACI,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QAC/C,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS;KAC1F,EACD;QACI,aAAa,EAAE,QAAQ;QACvB,UAAU,EAAE,CAAC;QACb,UAAU,EAAE,CAAC;QACb,UAAU,EAAE,QAAQ;KACvB,CACJ,CAAC;IACF,OAAO,GAAG,MAAM,KAAK,KAAK,EAAE,CAAC;AACjC,CAAC;AAED,yEAAyE;AACzE,4EAA4E;AAC5E,kCAAkC;AAClC,SAAS,YAAY,CAAC,IAAmB,EAAE,QAAiB;IACxD,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IACvD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,IAAI,CAAC,QAAQ;QAAE,OAAO,GAAG,GAAG,IAAI,YAAY,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;IAChE,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnC,MAAM,eAAe,GACjB,IAAI,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC/F,OAAO,GAAG,UAAU,IAAI,eAAe,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;AAC/D,CAAC"}

package/dist/generated/version.d.ts

@@ -1,4 +1,4 @@
-export declare const CLI_VERSION = "0.9.0";
+export declare const CLI_VERSION = "0.11.0";
 export interface CliBuild {
     /** Short git SHA at build time, or empty when not in a git checkout. */
     readonly sha: string;

package/dist/generated/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/generated/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,UAAU,CAAC;AAEnC,MAAM,WAAW,QAAQ;IACrB,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,wEAAwE;IACxE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,SAAS,EAAE,QAIvB,CAAC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/generated/version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,WAAW,CAAC;AAEpC,MAAM,WAAW,QAAQ;IACrB,wEAAwE;IACxE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,wEAAwE;IACxE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAED,eAAO,MAAM,SAAS,EAAE,QAIvB,CAAC"}

package/dist/generated/version.js

@@ -1,7 +1,7 @@
 // Auto-generated by scripts/bundle-templates.mjs. Do not edit by hand.
-export const CLI_VERSION = "0.9.0";
+export const CLI_VERSION = "0.11.0";
 export const CLI_BUILD = {
-    "sha": "06f9e6f",
+    "sha": "d8d931f",
     "isRelease": true,
     "isDirty": false
 };

package/dist/generated/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/generated/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC;AAWnC,MAAM,CAAC,MAAM,SAAS,GAAa;IAC/B,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,KAAK;CACnB,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/generated/version.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAWpC,MAAM,CAAC,MAAM,SAAS,GAAa;IAC/B,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,IAAI;IACjB,SAAS,EAAE,KAAK;CACnB,CAAC"}

package/man/fr/nowline.1

@@ -5,7 +5,7 @@
 .\" Empreinte de la page anglaise relue pour cette traduction. Après avoir
 .\" reporté une modification de la page anglaise, remplacez-la par la ligne
 .\" qu'affiche packages/cli/test/man/translation-parity.test.ts.
-.\" translated-from: nowline.1 sha256:3fc6d77fadcf4ba2add7f127da8cff257262ed010f253a1b0a0e7801b56f0d4f
+.\" translated-from: nowline.1 sha256:4f113445e5c8d41932dcdeb46732a884ed1f960b28bdb2becd0060ad4cde539c
 .Dd $Mdocdate$
 .Dt NOWLINE 1
 .Os
@@ -377,6 +377,44 @@ chargées (par défaut\ : la clé
 de
 .Pa .nowlinerc ,
 puis le dossier du fichier d'entrée).
+.It Fl -include-root Ar dossier
+Ne lire les inclusions qu'à l'intérieur de
+.Ar dossier .
+Chaque
+.Cm include ,
+à toute profondeur, doit être un chemin relatif qui se résout, liens
+symboliques suivis, vers un fichier
+.Pa .nowline
+situé dans
+.Ar dossier \ ;
+un chemin absolu, un
+.Pa ..
+qui en sort ou un lien symbolique qui pointe au dehors est l'erreur
+.Sy NL.E0208
+sur la ligne
+.Cm include ,
+et rien n'est lu.
+Avec l'entrée standard, les inclusions relatives se résolvent par
+rapport à
+.Ar dossier ,
+jamais par rapport au dossier de travail.
+Les diagnostics d'un fichier inclus le nomment relativement à
+.Ar dossier .
+Un
+.Ar dossier
+inexistant ou qui n'est pas un dossier termine avec le code 2.
+Indicateur seulement\ : il n'y a pas de clé
+.Pa .nowlinerc .
+.It Fl -no-includes
+Ne lire aucune inclusion\ : chaque
+.Cm include
+est l'erreur
+.Sy NL.E0209
+.Pq Dq les includes ne sont pas pris en charge dans ce contexte
+sur sa ligne, et rien n'est lu sur le disque.
+Pour les appelants qui valident une source non fiable.
+Incompatible avec
+.Fl -include-root .
 .El
 .Sh OPTIONS SPÉCIFIQUES AU FORMAT
 .Bl -tag -width Fl
@@ -439,8 +477,10 @@ Ouvre le navigateur au démarrage.
 .Sh OPTIONS MCP
 .Bl -tag -width Fl
 .It Fl -root Ar rép
-Répertoire que les outils de fichiers MCP peuvent lire et écrire (par
-défaut\ : le répertoire courant).
+Répertoire que les outils de fichiers MCP peuvent lire et écrire.
+Sans cette option, le serveur utilise les racines que le client annonce
+via MCP (les chemins relatifs sont résolus par rapport à la première), ou
+le répertoire courant si le client n'en annonce aucune.
 Avec
 .Fl -mcp-install ,
 il est inscrit dans la commande enregistrée sous forme de chemin absolu.
@@ -590,7 +630,17 @@ ne s'appliquent qu'en ligne de commande.
 Succès.
 .It 1
 Erreur de validation (analyse en échec, référence invalide, etc.), y
-compris les règles de vagues vérifiées à travers les fichiers inclus,
+compris toute erreur d'inclusion (inclusion manquante, illisible,
+circulaire, en double ou trop profonde,
+.Cm start:
+différent, ou inclusion refusée par
+.Fl -include-root
+ou
+.Fl -no-includes ,
+.Sy NL.E0203
+à
+.Sy NL.E0210 )
+et les règles de vagues vérifiées à travers les fichiers inclus,
 comme
 .Sy NL.E0202 .
 Elles sont signalées comme les diagnostics du validateur, au fichier et
@@ -601,10 +651,7 @@ mutuellement exclusifs, format non pris en charge, fichier introuvable,
 sortie binaire vers un terminal, entrée illisible).
 .It 3
 Erreur de sortie (impossible d'écrire à la destination, échec du
-pipeline d'export), y compris une inclusion impossible à résoudre
-(inclusion illisible, circulaire ou en double,
-.Cm start:
-différent).
+pipeline d'export).
 .El
 .Sh EXEMPLES
 Produire le SVG par défaut dans le dossier courant\ :

package/man/nowline.1

@@ -356,6 +356,44 @@ Directory from which logo / image assets may be loaded
 key of
 .Pa .nowlinerc ,
 then the input file's directory).
+.It Fl -include-root Ar dir
+Read includes only from inside
+.Ar dir .
+Every
+.Cm include ,
+at any depth, must be a relative path that resolves, symbolic links
+followed, to a
+.Pa .nowline
+file inside
+.Ar dir ;
+an absolute path, a
+.Pa ..
+that leaves it, or a symbolic link that points out of it is error
+.Sy NL.E0208
+on the
+.Cm include
+line, and nothing is read.
+With standard input, relative includes resolve against
+.Ar dir ,
+never the working directory.
+Diagnostics in an included file name it relative to
+.Ar dir .
+A
+.Ar dir
+that does not exist or is not a directory exits with status 2.
+Flag only: there is no
+.Pa .nowlinerc
+key.
+.It Fl -no-includes
+Read no includes: every
+.Cm include
+is error
+.Sy NL.E0209
+.Pq Dq includes are not supported in this context
+on its line, and nothing is read from disk.
+For callers that validate untrusted source.
+Cannot be combined with
+.Fl -include-root .
 .El
 .Sh FORMAT-SPECIFIC OPTIONS
 .Bl -tag -width Fl
@@ -417,8 +455,10 @@ Open the browser on start.
 .Sh MCP OPTIONS
 .Bl -tag -width Fl
 .It Fl -root Ar dir
-Directory the MCP file tools may read and write (default: the current
-directory).
+Directory the MCP file tools may read and write.
+Without it, the server uses the roots the client advertises over MCP
+(relative paths resolve against the first), or the current directory
+when the client has none.
 With
 .Fl -mcp-install ,
 it is written into the registered command as an absolute path.
@@ -565,7 +605,18 @@ apply only on the command line.
 Success.
 .It 1
 Validation error (parse failure, invalid reference, etc.), including
-the wave rules checked across included files, such as
+every include error (a missing, unreadable, circular, duplicate or too
+deep include, a mismatched
+.Cm start: ,
+or one that
+.Fl -include-root
+or
+.Fl -no-includes
+refuses,
+.Sy NL.E0203
+to
+.Sy NL.E0210 )
+and the wave rules checked across included files, such as
 .Sy NL.E0202 .
 Those are reported like validator diagnostics, at the file and line
 they point into.
@@ -574,10 +625,7 @@ Usage error (missing input, bad flags, mutually-exclusive flags,
 unsupported format, file not found, binary output to TTY, unreadable
 input).
 .It 3
-Output error (cannot write to destination, exporter pipeline failure),
-including an include that cannot be resolved (unreadable, circular or
-duplicate include, mismatched
-.Cm start: ) .
+Output error (cannot write to destination, exporter pipeline failure).
 .El
 .Sh EXAMPLES
 Render the default SVG to the current directory:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowline/cli",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "description": "Command-line tool to check, convert, and create Nowline roadmaps.",
   "license": "Apache-2.0",
   "engines": {
@@ -33,19 +33,19 @@
     "@babel/code-frame": "^8.0.6",
     "@clack/prompts": "^1.8.1",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@nowline/config": "0.9.0",
-    "@nowline/core": "0.9.0",
-    "@nowline/export": "0.9.0",
-    "@nowline/export-core": "0.9.0",
-    "@nowline/export-html": "0.9.0",
-    "@nowline/export-mermaid": "0.9.0",
-    "@nowline/export-msproj": "0.9.0",
-    "@nowline/export-pdf": "0.9.0",
-    "@nowline/export-png": "0.9.0",
-    "@nowline/export-xlsx": "0.9.0",
-    "@nowline/layout": "0.9.0",
-    "@nowline/mcp": "0.9.0",
-    "@nowline/renderer": "0.9.0",
+    "@nowline/config": "0.11.0",
+    "@nowline/core": "0.11.0",
+    "@nowline/export": "0.11.0",
+    "@nowline/export-core": "0.11.0",
+    "@nowline/export-html": "0.11.0",
+    "@nowline/export-mermaid": "0.11.0",
+    "@nowline/export-msproj": "0.11.0",
+    "@nowline/export-pdf": "0.11.0",
+    "@nowline/export-png": "0.11.0",
+    "@nowline/export-xlsx": "0.11.0",
+    "@nowline/layout": "0.11.0",
+    "@nowline/mcp": "0.11.0",
+    "@nowline/renderer": "0.11.0",
     "chalk": "^6.0.1",
     "citty": "^0.2.2",
     "consola": "^3.4.2",

package/src/cli/args.ts

@@ -60,6 +60,14 @@ export interface ParsedArgs {
      */
     nonWorking?: string;
     assetRoot?: string;
+    /**
+     * `--include-root <dir>`: every include must resolve inside this
+     * directory, and a stdin input's includes resolve against it.
+     * Validated by the render and serve commands.
+     */
+    includeRoot?: string;
+    /** `--no-includes`: every `include` is an error and nothing is read. */
+    noIncludes: boolean;
 
     // Format-specific options (m2c)
     pageSize?: string;
@@ -119,6 +127,7 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
             dryRun: false,
             logLevel: 'normal',
             noLinks: false,
+            noIncludes: false,
             strict: false,
             open: false,
             headless: false,
@@ -162,6 +171,8 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
             width: { type: 'string', short: 'w' },
             'non-working': { type: 'string' },
             'asset-root': { type: 'string' },
+            'include-root': { type: 'string' },
+            'no-includes': { type: 'boolean' },
 
             port: { type: 'string', short: 'p' },
             host: { type: 'string' },
@@ -208,6 +219,7 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
             dryRun: false,
             logLevel: 'normal',
             noLinks: false,
+            noIncludes: false,
             strict: false,
             open: false,
             headless: false,
@@ -220,6 +232,7 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
             dryRun: false,
             logLevel: 'normal',
             noLinks: false,
+            noIncludes: false,
             strict: false,
             open: false,
             headless: false,
@@ -265,6 +278,13 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
         throw new CliError(ExitCode.InputError, `nowline: unexpected extra arguments: ${extras}.`);
     }
 
+    if (values['no-includes'] === true && values['include-root'] !== undefined) {
+        throw new CliError(
+            ExitCode.InputError,
+            'nowline: --no-includes and --include-root are mutually exclusive.',
+        );
+    }
+
     const scope = stringOrUndefined(values.scope);
     if (scope !== undefined && scope !== 'user' && scope !== 'project') {
         throw new CliError(
@@ -308,6 +328,8 @@ export function parseArgv(argv: readonly string[]): ParsedArgs {
         width: stringOrUndefined(values.width),
         nonWorking: stringOrUndefined(values['non-working']),
         assetRoot: stringOrUndefined(values['asset-root']),
+        includeRoot: stringOrUndefined(values['include-root']),
+        noIncludes: values['no-includes'] === true,
         port: stringOrUndefined(values.port),
         host: stringOrUndefined(values.host),
         open: values.open === true,

package/src/cli/help.ts

@@ -87,6 +87,14 @@ RENDER OPTIONS
                           is the same in both views.
       --asset-root <dir>  Root for logo / image assets (default: the
                           .nowlinerc assetRoot key, then the input dir).
+      --include-root <dir>
+                          Read includes only from inside <dir>. An absolute
+                          path, a '..' or a symlink that leaves it is error
+                          NL.E0208. Stdin includes resolve against <dir>,
+                          never the cwd; included files are named relative
+                          to it.
+      --no-includes       Read no includes: every include is error NL.E0209.
+                          For validating untrusted source.
       --locale <bcp47>    BCP-47 locale (e.g. fr, fr-CA) for CLI message
                           output (validator diagnostics, --help, errors).
                           Used as a fallback for the rendered drawing only
@@ -144,7 +152,7 @@ EXAMPLES
   nowline roadmap.nowline --dry-run         # validate-only
   nowline roadmap.nowline --serve -p 8080   # live preview
   nowline --init my-project                 # scaffold ./my-project.nowline
-  nowline --mcp                             # start MCP stdio server in cwd
+  nowline --mcp                             # start MCP stdio server
   nowline --mcp --root ./roadmaps           # MCP server with custom root
   nowline --mcp-install                     # register with every agent found
   nowline --mcp-install cursor --scope project -n   # preview .cursor/mcp.json

package/src/cli/include-policy.ts

@@ -0,0 +1,59 @@
+import { promises as fs } from 'node:fs';
+import * as path from 'node:path';
+import type { IncludePolicy } from '@nowline/core';
+import { CliError, ExitCode } from '../io/exit-codes.js';
+import type { ParsedArgs } from './args.js';
+
+/** Where a run's includes may be read from, and where its root file sits. */
+export interface IncludeSetup {
+    /** Omitted: includes resolve anywhere, relative to the including file. */
+    policy?: IncludePolicy;
+    /** `--include-root` as a real path; included files are named relative to it. */
+    root?: string;
+    /**
+     * The absolute path include resolution sees for the input: under a root,
+     * a stdin input sits in the root and a file input is its real path, so
+     * the working directory never affects resolution.
+     */
+    inputPath: string;
+}
+
+/**
+ * Resolve `--no-includes` / `--include-root` (mutually exclusive, checked by
+ * `parseArgv`). A root that is missing or not a directory is a usage error.
+ * `inputPath` is the input's absolute path, or undefined for stdin.
+ */
+export async function resolveIncludeSetup(
+    args: Pick<ParsedArgs, 'includeRoot' | 'noIncludes'>,
+    inputPath: string | undefined,
+    cwd: string,
+): Promise<IncludeSetup> {
+    const stdinPath = (dir: string): string => path.join(dir, 'stdin.nowline');
+    if (args.noIncludes) {
+        return { policy: { kind: 'disabled' }, inputPath: inputPath ?? stdinPath(cwd) };
+    }
+    if (args.includeRoot === undefined) {
+        return { inputPath: inputPath ?? stdinPath(cwd) };
+    }
+    const root = await realDirectory(args.includeRoot, cwd);
+    return {
+        policy: { kind: 'rooted', root },
+        root,
+        inputPath: inputPath === undefined ? stdinPath(root) : await fs.realpath(inputPath),
+    };
+}
+
+async function realDirectory(dir: string, cwd: string): Promise<string> {
+    const notADirectory = new CliError(
+        ExitCode.InputError,
+        `nowline: invalid --include-root "${dir}". Expected an existing directory.`,
+    );
+    let real: string;
+    try {
+        real = await fs.realpath(path.resolve(cwd, dir));
+    } catch {
+        throw notADirectory;
+    }
+    if (!(await fs.stat(real)).isDirectory()) throw notADirectory;
+    return real;
+}

package/src/commands/mcp.ts

@@ -18,7 +18,8 @@ import { createLog } from '../io/log.js';
  * Runs until the process receives SIGINT/SIGTERM or the client closes stdin.
  */
 export async function mcpHandler({ args }: { args: ParsedArgs }): Promise<void> {
-    const root = args.root ?? process.cwd();
+    // Without --root the server follows the client's MCP roots, else cwd.
+    const root = args.root;
 
     const portStr = args.port;
     if (portStr !== undefined) {

package/src/commands/render.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from 'node:fs';
 import * as path from 'node:path';
-import type { ResolveDiagnostic } from '@nowline/core';
+import type { IncludePolicy, ResolveDiagnostic } from '@nowline/core';
 import {
     acceptStagedRoadmap,
     type ExportFormat,
@@ -20,6 +20,7 @@ import {
     type OutputFormat,
     resolveFormat,
 } from '../cli/formats.js';
+import { resolveIncludeSetup } from '../cli/include-policy.js';
 import { type PdfOrientation, resolveCliOptions } from '../cli/options.js';
 import { resolveRenderOutputPath } from '../cli/output-path.js';
 import { parseNowlineJson } from '../convert/parse-json.js';
@@ -95,6 +96,7 @@ export async function renderHandler(options: RenderHandlerOptions): Promise<void
     const inputFormat = resolveInputFormat(args.positional, args.inputFormat);
 
     const input = await readInput(args.positional, { cwd });
+    const includes = await resolveIncludeSetup(args, input.isStdin ? undefined : input.path, cwd);
 
     const resolved = resolveLocaleOverride({
         flag: args.locale,
@@ -110,8 +112,10 @@ export async function renderHandler(options: RenderHandlerOptions): Promise<void
         inputFormat,
         contents: input.contents,
         displayPath: input.displayPath,
-        absInputPath: input.isStdin ? path.resolve(cwd, 'stdin.nowline') : input.path,
+        absInputPath: includes.inputPath,
         isStdin: input.isStdin,
+        includePolicy: includes.policy,
+        includeRoot: includes.root,
         theme: cliOptions.surface.theme,
         today: cliOptions.surface.today,
         width: cliOptions.surface.width,
@@ -200,6 +204,9 @@ interface ProduceArgs {
     displayPath: string;
     absInputPath: string;
     isStdin: boolean;
+    includePolicy?: IncludePolicy;
+    /** `--include-root` as a real path: included files are named relative to it. */
+    includeRoot?: string;
     theme: ThemeName;
     today?: Date;
     width?: number;
@@ -330,11 +337,13 @@ async function produce(args: ProduceArgs): Promise<ProduceResult> {
 }
 
 /**
- * How an included file is named in diagnostics: relative to the input's
- * display path, so `examples/a.nowline` including `./teams/b.nowline` prints
- * `examples/teams/b.nowline` (absolute when the input was given absolute).
+ * How an included file is named in diagnostics: relative to the include root
+ * when one is set, else to the input's display path, so `examples/a.nowline`
+ * including `./teams/b.nowline` prints `examples/teams/b.nowline` (absolute
+ * when the input was given absolute).
  */
 function includeDisplayPath(absPath: string, args: ProduceArgs): string {
+    if (args.includeRoot) return path.relative(args.includeRoot, absPath);
     const rel = path.relative(path.dirname(args.absInputPath), absPath);
     if (path.isAbsolute(rel)) return rel;
     const base = args.isStdin ? '' : path.dirname(args.displayPath);
@@ -485,6 +494,7 @@ async function parseAndValidate(
             stage = await stageForExport(contents, inputs, host, {
                 document: result.document,
                 services: getServices(),
+                includePolicy: args.includePolicy,
             });
         } catch (err) {
             stageFailure = err;

package/src/commands/serve.ts

@@ -5,6 +5,7 @@ import { isRoutedResolveDiagnostic } from '@nowline/core';
 import type { ThemeName } from '@nowline/layout';
 import { renderSvg, stageRoadmap } from '@nowline/renderer';
 import type { ParsedArgs } from '../cli/args.js';
+import { resolveIncludeSetup } from '../cli/include-policy.js';
 import { resolveCliOptions } from '../cli/options.js';
 import { getServices, parseSource } from '../core/parse.js';
 import {
@@ -76,12 +77,15 @@ export async function serveHandler(options: ServeHandlerOptions): Promise<void>
     const locale = resolvedLocale.tag;
     const opLocale = operatorLocale(resolvedLocale);
 
-    const inputPath = path.resolve(cwd, args.positional);
+    const givenPath = path.resolve(cwd, args.positional);
     try {
-        await fs.access(inputPath);
+        await fs.access(givenPath);
     } catch {
         throw new CliError(ExitCode.InputError, `nowline: file not found: ${args.positional}`);
     }
+    // Under --include-root the input is its real path, which the include
+    // root is compared against.
+    const { policy: includePolicy, inputPath } = await resolveIncludeSetup(args, givenPath, cwd);
 
     // `--asset-root`, else the rc `assetRoot` (relative to the `.nowlinerc`), else
     // the input's directory.
@@ -131,6 +135,7 @@ export async function serveHandler(options: ServeHandlerOptions): Promise<void>
                 assetResolver,
                 document: parse.document,
                 layout: { theme, today, locale, width, nonWorking },
+                includePolicy,
             });
             if (stage.kind === 'invalid') {
                 // The parse above found no errors, so the stage cannot disagree.

package/src/diagnostics/adapt.ts

@@ -1,11 +1,11 @@
 import {
-    extractSuggestion,
     inferCodeFromMessage,
     type LangiumLikeDiagnostic,
     type LexerErrorLike,
     type ParserErrorLike,
     type ResolveDiagnostic,
     resolveDiagnosticCode,
+    resolveDiagnosticSuggestion,
 } from '@nowline/core';
 import type { CliDiagnostic, DiagnosticSeverity, LocalizedMessageData } from './model.js';
 
@@ -31,7 +31,7 @@ export function adaptLangiumDiagnostic(diag: LangiumLikeDiagnostic, file: string
                   },
               }
             : undefined,
-        suggestion: extractSuggestion(diag.message),
+        suggestion: resolveDiagnosticSuggestion(diag.message, diag.data),
         // The CLI keeps the full { code, args } so formatDiagnostics can
         // re-render the message in the operator's locale at print time.
         data: extractMessageData(diag.data),
@@ -109,6 +109,7 @@ export function adaptResolveDiagnostic(
     // checked on its own.
     if (diag.syntax?.origin === 'lexer') return adaptLexerError(diag.syntax.error, file);
     if (diag.syntax?.origin === 'parser') return adaptParserError(diag.syntax.error, file);
+    const data = diag.code === undefined ? undefined : { code: diag.code, args: diag.args ?? [] };
     return {
         file,
         ...resolveLocation(diag, contents),
@@ -116,8 +117,8 @@ export function adaptResolveDiagnostic(
         // WV8 is uncoded; label it the way the validator's copy is labelled.
         code: diag.code ?? inferCodeFromMessage(diag.message),
         message: diag.message,
-        suggestion: extractSuggestion(diag.message),
-        data: diag.code === undefined ? undefined : { code: diag.code, args: diag.args ?? [] },
+        suggestion: resolveDiagnosticSuggestion(diag.message, data),
+        data,
     };
 }
 

package/src/diagnostics/text.ts

@@ -39,24 +39,15 @@ function renderOne(
     return `${header}\n${frame}`;
 }
 
+// The message is printed as is. A diagnostic with a `suggestion` already
+// offers it in the message's own words and locale ("Did you mean ...?"), so
+// the header adds nothing for it.
 function renderHeader(diag: CliDiagnostic, useColor: boolean): string {
     const loc = `${diag.file}:${diag.line}:${diag.column}`;
     const severityWord = diag.severity === 'error' ? 'error' : 'warning';
-    if (!useColor) {
-        const suffix = diag.suggestion ? ` — did you mean '${diag.suggestion}'?` : '';
-        return `${loc} ${severityWord}: ${stripSuggestion(diag.message, diag.suggestion)}${suffix}`;
-    }
+    if (!useColor) return `${loc} ${severityWord}: ${diag.message}`;
     const coloredLoc = chalk.cyan(loc);
     const coloredSeverity =
         diag.severity === 'error' ? chalk.red.bold(severityWord) : chalk.yellow.bold(severityWord);
-    const message = stripSuggestion(diag.message, diag.suggestion);
-    const suggestion = diag.suggestion
-        ? ` ${chalk.dim('—')} did you mean ${chalk.green(`'${diag.suggestion}'`)}?`
-        : '';
-    return `${coloredLoc} ${coloredSeverity}: ${message}${suggestion}`;
-}
-
-function stripSuggestion(message: string, suggestion: string | undefined): string {
-    if (!suggestion) return message;
-    return message.replace(/ —\s*did you mean ['"]?[^'"?]+['"]?\??/i, '').trimEnd();
+    return `${coloredLoc} ${coloredSeverity}: ${diag.message}`;
 }

package/src/generated/version.ts

@@ -1,6 +1,6 @@
 // Auto-generated by scripts/bundle-templates.mjs. Do not edit by hand.
 
-export const CLI_VERSION = "0.9.0";
+export const CLI_VERSION = "0.11.0";
 
 export interface CliBuild {
     /** Short git SHA at build time, or empty when not in a git checkout. */
@@ -12,7 +12,7 @@ export interface CliBuild {
 }
 
 export const CLI_BUILD: CliBuild = {
-    "sha": "06f9e6f",
+    "sha": "d8d931f",
     "isRelease": true,
     "isDirty": false
 };