@creator-notes/cnotes 0.16.11 → 0.16.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.mcp.json +3 -3
- package/README.md +3 -3
- package/dist/cn.js +3 -4
- package/dist/cn.js.map +1 -1
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +1 -2
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/canvas.d.ts.map +1 -1
- package/dist/commands/canvas.js +15 -16
- package/dist/commands/canvas.js.map +1 -1
- package/dist/commands/mcp.js +9 -9
- package/dist/commands/mcp.js.map +1 -1
- package/dist/commands/notes.d.ts.map +1 -1
- package/dist/commands/notes.js +65 -2
- package/dist/commands/notes.js.map +1 -1
- package/dist/commands/operations.d.ts +2 -2
- package/dist/commands/operations.d.ts.map +1 -1
- package/dist/commands/operations.js +3 -4
- package/dist/commands/operations.js.map +1 -1
- package/dist/commands/types.d.ts.map +1 -1
- package/dist/commands/types.js +46 -1
- package/dist/commands/types.js.map +1 -1
- package/dist/commands/versions.d.ts.map +1 -1
- package/dist/commands/versions.js +18 -1
- package/dist/commands/versions.js.map +1 -1
- package/dist/lib/api-client.d.ts +1 -1
- package/dist/lib/api-client.d.ts.map +1 -1
- package/dist/lib/api-client.js +3 -4
- package/dist/lib/api-client.js.map +1 -1
- package/dist/lib/auth-store.d.ts.map +1 -1
- package/dist/lib/auth-store.js +1 -2
- package/dist/lib/auth-store.js.map +1 -1
- package/dist/lib/build-schema.d.ts +6 -6
- package/dist/lib/build-schema.js +6 -6
- package/dist/lib/build-schema.js.map +1 -1
- package/dist/lib/claude-session.d.ts +1 -1
- package/dist/lib/claude-session.d.ts.map +1 -1
- package/dist/lib/claude-session.js +3 -4
- package/dist/lib/claude-session.js.map +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +8 -9
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/errors.d.ts +13 -0
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +33 -2
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/install-mcp.js +6 -6
- package/dist/lib/install-mcp.js.map +1 -1
- package/dist/lib/mention-lint.d.ts +53 -0
- package/dist/lib/mention-lint.d.ts.map +1 -0
- package/dist/lib/mention-lint.js +104 -0
- package/dist/lib/mention-lint.js.map +1 -0
- package/dist/mcp-server.js +121 -72
- package/dist/mcp-server.js.map +1 -1
- package/package.json +1 -1
- package/skills/cnotes/SKILL.md +87 -13
|
@@ -55,12 +55,12 @@ export declare const STATIC_SCHEMA: {
|
|
|
55
55
|
readonly "7": "permission denied";
|
|
56
56
|
};
|
|
57
57
|
readonly env: {
|
|
58
|
-
readonly
|
|
59
|
-
readonly
|
|
60
|
-
readonly
|
|
61
|
-
readonly
|
|
62
|
-
readonly
|
|
63
|
-
readonly
|
|
58
|
+
readonly CNOTES_SERVER: "Override server URL";
|
|
59
|
+
readonly CNOTES_TOKEN: "Auth token (alternative to `cnotes auth login`)";
|
|
60
|
+
readonly CNOTES_WORKSPACE: "Override workspace ID for this invocation";
|
|
61
|
+
readonly CNOTES_JSON: "Set to 1 to force JSON output";
|
|
62
|
+
readonly CNOTES_AGENT_RUN_ID: "Active agent-run bracket (set by `cnotes canvas agent-run begin/wrap`)";
|
|
63
|
+
readonly CNOTES_AGENT_BEFORE_SNAPSHOT_ID: "Begin-snapshot ID carried with the agent-run";
|
|
64
64
|
};
|
|
65
65
|
readonly agentRun: {
|
|
66
66
|
readonly note: "Wrap multi-step canvas mutations in an agent-run so they show up as one revertable unit in the UI history.";
|
package/dist/lib/build-schema.js
CHANGED
|
@@ -65,12 +65,12 @@ export const STATIC_SCHEMA = {
|
|
|
65
65
|
"7": "permission denied",
|
|
66
66
|
},
|
|
67
67
|
env: {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
68
|
+
CNOTES_SERVER: "Override server URL",
|
|
69
|
+
CNOTES_TOKEN: "Auth token (alternative to `cnotes auth login`)",
|
|
70
|
+
CNOTES_WORKSPACE: "Override workspace ID for this invocation",
|
|
71
|
+
CNOTES_JSON: "Set to 1 to force JSON output",
|
|
72
|
+
CNOTES_AGENT_RUN_ID: "Active agent-run bracket (set by `cnotes canvas agent-run begin/wrap`)",
|
|
73
|
+
CNOTES_AGENT_BEFORE_SNAPSHOT_ID: "Begin-snapshot ID carried with the agent-run",
|
|
74
74
|
},
|
|
75
75
|
agentRun: {
|
|
76
76
|
note: "Wrap multi-step canvas mutations in an agent-run so they show up as one revertable unit in the UI history.",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-schema.js","sourceRoot":"","sources":["../../src/lib/build-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,aAAa,EAAE;QACb,IAAI,EAAE,iIAAiI;QACvI,MAAM,EAAE;YACN,YAAY;YACZ,UAAU;YACV,QAAQ;YACR,cAAc;YACd,aAAa;YACb,UAAU;YACV,SAAS;SACV;KACF;IACD,MAAM,EAAE;QACN,WAAW,EAAE,2CAA2C;QACxD,gBAAgB,EAAE,wGAAwG;QAC1H,KAAK,EAAE;YACL,6FAA6F;YAC7F,uEAAuE;SACxE;KACF;IACD,SAAS,EAAE;QACT,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,EAAE,EAAE,oBAAoB;gBACxB,SAAS,EAAE,4CAA4C;gBACvD,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,kDAAkD;gBACxD,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,kBAAkB;aAC9B;SACF;QACD,UAAU,EAAE;YACV,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC;YAC7D,IAAI,EAAE,qIAAqI;SAC5I;QACD,UAAU,EAAE;YACV,MAAM,EAAE;gBACN,YAAY,EAAE,QAAQ;gBACtB,YAAY,EAAE,QAAQ;gBACtB,KAAK,EAAE,8BAA8B;gBACrC,SAAS,EAAE,gBAAgB;gBAC3B,KAAK,EAAE,2BAA2B;aACnC;SACF;KACF;IACD,SAAS,EAAE;QACT,GAAG,EAAE,IAAI;QACT,GAAG,EAAE,eAAe;QACpB,GAAG,EAAE,yCAAyC;QAC9C,GAAG,EAAE,wBAAwB;QAC7B,GAAG,EAAE,WAAW;QAChB,GAAG,EAAE,4BAA4B;QACjC,GAAG,EAAE,cAAc;QACnB,GAAG,EAAE,mBAAmB;KACzB;IACD,GAAG,EAAE;QACH,
|
|
1
|
+
{"version":3,"file":"build-schema.js","sourceRoot":"","sources":["../../src/lib/build-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export declare function isStoredSessionUsable(stored: StoredSession, ctx: {
|
|
|
54
54
|
* traceable + resumable from the timeline). Resolution order, most explicit
|
|
55
55
|
* first:
|
|
56
56
|
*
|
|
57
|
-
* 1.
|
|
57
|
+
* 1. CNOTES_AGENT_SESSION_ID (+ optional CNOTES_AGENT_SESSION_KIND) — explicit
|
|
58
58
|
* override, wins everything. Lets any agent runtime opt in by hand.
|
|
59
59
|
* 2. The SessionStart-hook file written by `cnotes claude-hook`, when it's still
|
|
60
60
|
* fresh + scoped to this directory (see {@link isStoredSessionUsable}).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/lib/claude-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claude-session.d.ts","sourceRoot":"","sources":["../../src/lib/claude-session.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,YAAY;IAC3B;0EACsE;IACtE,IAAI,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,QAI/B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,QAAsB,CAAC;AAE3D,UAAU,aAAa;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAChC,OAAO,CAUT;AAQD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,GAAG,IAAI,CAgBzD"}
|
|
@@ -2,7 +2,6 @@ import { readFileSync } from "node:fs";
|
|
|
2
2
|
import { join, relative, isAbsolute } from "node:path";
|
|
3
3
|
import { homedir } from "node:os";
|
|
4
4
|
import { BRAND } from "./brand.js";
|
|
5
|
-
import { cnotesEnv } from "./env.js";
|
|
6
5
|
/**
|
|
7
6
|
* Where `cnotes claude-hook` (a Claude Code SessionStart hook) persists the
|
|
8
7
|
* current session id. A single "latest" file — simple and correct for the
|
|
@@ -58,7 +57,7 @@ function isWithin(child, parent) {
|
|
|
58
57
|
* traceable + resumable from the timeline). Resolution order, most explicit
|
|
59
58
|
* first:
|
|
60
59
|
*
|
|
61
|
-
* 1.
|
|
60
|
+
* 1. CNOTES_AGENT_SESSION_ID (+ optional CNOTES_AGENT_SESSION_KIND) — explicit
|
|
62
61
|
* override, wins everything. Lets any agent runtime opt in by hand.
|
|
63
62
|
* 2. The SessionStart-hook file written by `cnotes claude-hook`, when it's still
|
|
64
63
|
* fresh + scoped to this directory (see {@link isStoredSessionUsable}).
|
|
@@ -73,10 +72,10 @@ function isWithin(child, parent) {
|
|
|
73
72
|
* case the run simply isn't session-stamped — no error.
|
|
74
73
|
*/
|
|
75
74
|
export function resolveAgentSession() {
|
|
76
|
-
const overrideId =
|
|
75
|
+
const overrideId = process.env.CNOTES_AGENT_SESSION_ID?.trim();
|
|
77
76
|
if (overrideId) {
|
|
78
77
|
return {
|
|
79
|
-
kind:
|
|
78
|
+
kind: process.env.CNOTES_AGENT_SESSION_KIND?.trim() || "claude-code",
|
|
80
79
|
id: overrideId,
|
|
81
80
|
};
|
|
82
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-session.js","sourceRoot":"","sources":["../../src/lib/claude-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-session.js","sourceRoot":"","sources":["../../src/lib/claude-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAUnC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CACrC,OAAO,EAAE,EACT,KAAK,CAAC,SAAS,EACf,qBAAqB,CACtB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,MAAM;AASlE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAqB,EACrB,GAAiC;IAEjC,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,KAAK,CAAC;IAC7B,IACE,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ;QACpC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,SAAS,GAAG,uBAAuB,EACpD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,0DAA0D;AAC1D,SAAS,QAAQ,CAAC,KAAa,EAAE,MAAc;IAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACpC,OAAO,GAAG,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,CAAC;IAC/D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,IAAI,EAAE,IAAI,aAAa;YACpE,EAAE,EAAE,UAAU;SACf,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC;IACzD,IAAI,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IAErD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,GAAW,EAAE,GAAW;IAC/C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAkB,CAAC;QAChD,IAAI,qBAAqB,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;YAChD,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;QAC/D,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;IACjE,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,UAAU,UAAU;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAWD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAqC9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAmBlH"}
|
package/dist/lib/config.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { loadConfig, getServerConfig } from "./auth-store.js";
|
|
2
2
|
import { AuthError, ValidationError } from "./errors.js";
|
|
3
|
-
import { cnotesEnv } from "./env.js";
|
|
4
3
|
/**
|
|
5
4
|
* Parse a `--fields a,b,c` option into a trimmed list, or undefined when unset.
|
|
6
5
|
*/
|
|
@@ -17,23 +16,23 @@ function parseFields(fields) {
|
|
|
17
16
|
export function resolveConfig(opts) {
|
|
18
17
|
const config = loadConfig();
|
|
19
18
|
// Server URL
|
|
20
|
-
const serverUrl = opts.server ||
|
|
19
|
+
const serverUrl = opts.server || process.env.CNOTES_SERVER || config.currentServer;
|
|
21
20
|
// Token
|
|
22
|
-
const envToken =
|
|
21
|
+
const envToken = process.env.CNOTES_TOKEN;
|
|
23
22
|
const configToken = getServerConfig(config, serverUrl)?.token;
|
|
24
23
|
const token = envToken || configToken;
|
|
25
24
|
if (!token) {
|
|
26
25
|
throw new AuthError();
|
|
27
26
|
}
|
|
28
27
|
// Workspace ID
|
|
29
|
-
const envWorkspace =
|
|
28
|
+
const envWorkspace = process.env.CNOTES_WORKSPACE;
|
|
30
29
|
const configWorkspace = getServerConfig(config, serverUrl)?.workspaceId;
|
|
31
30
|
const workspaceId = opts.workspace || envWorkspace || configWorkspace;
|
|
32
31
|
if (!workspaceId) {
|
|
33
32
|
throw new ValidationError("No workspace selected. Run `cnotes workspace select` or pass --workspace <id>");
|
|
34
33
|
}
|
|
35
34
|
// Output format
|
|
36
|
-
const json = opts.json ||
|
|
35
|
+
const json = opts.json || process.env.CNOTES_JSON === "1" || !process.stdout.isTTY;
|
|
37
36
|
return {
|
|
38
37
|
serverUrl,
|
|
39
38
|
token,
|
|
@@ -48,16 +47,16 @@ export function resolveConfig(opts) {
|
|
|
48
47
|
*/
|
|
49
48
|
export function resolveBaseConfig(opts) {
|
|
50
49
|
const config = loadConfig();
|
|
51
|
-
const serverUrl = opts.server ||
|
|
52
|
-
const envToken =
|
|
50
|
+
const serverUrl = opts.server || process.env.CNOTES_SERVER || config.currentServer;
|
|
51
|
+
const envToken = process.env.CNOTES_TOKEN;
|
|
53
52
|
const configToken = getServerConfig(config, serverUrl)?.token;
|
|
54
53
|
const token = envToken || configToken || "";
|
|
55
54
|
const configWorkspace = getServerConfig(config, serverUrl)?.workspaceId;
|
|
56
|
-
const json = opts.json ||
|
|
55
|
+
const json = opts.json || process.env.CNOTES_JSON === "1" || !process.stdout.isTTY;
|
|
57
56
|
return {
|
|
58
57
|
serverUrl,
|
|
59
58
|
token,
|
|
60
|
-
workspaceId: opts.workspace ||
|
|
59
|
+
workspaceId: opts.workspace || process.env.CNOTES_WORKSPACE || configWorkspace,
|
|
61
60
|
json: json ?? false,
|
|
62
61
|
quiet: opts.quiet ?? false,
|
|
63
62
|
fields: parseFields(opts.fields),
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/errors.d.ts
CHANGED
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
* 5 conflict (already exists / state collision)
|
|
11
11
|
* 6 rate-limited
|
|
12
12
|
* 7 permission denied
|
|
13
|
+
* 8 subscription required (workspace needs a paid plan — e.g. CLI/API writes
|
|
14
|
+
* on a free workspace). Distinct from 7 so an agent can branch on "needs
|
|
15
|
+
* Pro" without confusing it with an editor-permission denial; the JSON
|
|
16
|
+
* error carries `serverCode: "subscription_required"` and an `upgradeUrl`.
|
|
13
17
|
*/
|
|
14
18
|
export declare const EXIT_CODES: {
|
|
15
19
|
readonly OK: 0;
|
|
@@ -20,6 +24,7 @@ export declare const EXIT_CODES: {
|
|
|
20
24
|
readonly CONFLICT: 5;
|
|
21
25
|
readonly RATE_LIMIT: 6;
|
|
22
26
|
readonly PERMISSION: 7;
|
|
27
|
+
readonly SUBSCRIPTION: 8;
|
|
23
28
|
};
|
|
24
29
|
export declare class CliError extends Error {
|
|
25
30
|
exitCode: number;
|
|
@@ -38,6 +43,14 @@ export declare class NotFoundError extends CliError {
|
|
|
38
43
|
export declare class ApiError extends CliError {
|
|
39
44
|
status: number;
|
|
40
45
|
body: Record<string, unknown>;
|
|
46
|
+
/**
|
|
47
|
+
* Stable machine-readable error code from the server body (e.g.
|
|
48
|
+
* "subscription_required"), surfaced in `--json` so agents can branch on the
|
|
49
|
+
* condition rather than parsing prose.
|
|
50
|
+
*/
|
|
51
|
+
serverCode?: string;
|
|
52
|
+
/** Action URL the server points the caller to (e.g. the workspace billing page). */
|
|
53
|
+
upgradeUrl?: string;
|
|
41
54
|
constructor(status: number, body: Record<string, unknown>);
|
|
42
55
|
}
|
|
43
56
|
/**
|
package/dist/lib/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;CAUb,CAAC;AAEX,qBAAa,QAAS,SAAQ,KAAK;IAKxB,QAAQ,EAAE,MAAM;IAJzB,IAAI,CAAC,EAAE,MAAM,CAAC;gBAGZ,OAAO,EAAE,MAAM,EACR,QAAQ,GAAE,MAA2B,EAC5C,IAAI,CAAC,EAAE,MAAM;CAMhB;AAED,qBAAa,SAAU,SAAQ,QAAQ;gBAEnC,OAAO,GAAE,MAAmC,EAC5C,IAAI,GAAE,MAAmD;CAK5D;AAED,qBAAa,eAAgB,SAAQ,QAAQ;gBAC/B,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;CAI3C;AAED,qBAAa,aAAc,SAAQ,QAAQ;gBAC7B,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;CAI3C;AAED,qBAAa,QAAS,SAAQ,QAAQ;IAW3B,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAXtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,CAAC;gBAGX,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CA2BvC;AA4FD;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK,CAmChE"}
|
package/dist/lib/errors.js
CHANGED
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
* 5 conflict (already exists / state collision)
|
|
11
11
|
* 6 rate-limited
|
|
12
12
|
* 7 permission denied
|
|
13
|
+
* 8 subscription required (workspace needs a paid plan — e.g. CLI/API writes
|
|
14
|
+
* on a free workspace). Distinct from 7 so an agent can branch on "needs
|
|
15
|
+
* Pro" without confusing it with an editor-permission denial; the JSON
|
|
16
|
+
* error carries `serverCode: "subscription_required"` and an `upgradeUrl`.
|
|
13
17
|
*/
|
|
14
18
|
export const EXIT_CODES = {
|
|
15
19
|
OK: 0,
|
|
@@ -20,6 +24,7 @@ export const EXIT_CODES = {
|
|
|
20
24
|
CONFLICT: 5,
|
|
21
25
|
RATE_LIMIT: 6,
|
|
22
26
|
PERMISSION: 7,
|
|
27
|
+
SUBSCRIPTION: 8,
|
|
23
28
|
};
|
|
24
29
|
export class CliError extends Error {
|
|
25
30
|
exitCode;
|
|
@@ -53,21 +58,40 @@ export class NotFoundError extends CliError {
|
|
|
53
58
|
export class ApiError extends CliError {
|
|
54
59
|
status;
|
|
55
60
|
body;
|
|
61
|
+
/**
|
|
62
|
+
* Stable machine-readable error code from the server body (e.g.
|
|
63
|
+
* "subscription_required"), surfaced in `--json` so agents can branch on the
|
|
64
|
+
* condition rather than parsing prose.
|
|
65
|
+
*/
|
|
66
|
+
serverCode;
|
|
67
|
+
/** Action URL the server points the caller to (e.g. the workspace billing page). */
|
|
68
|
+
upgradeUrl;
|
|
56
69
|
constructor(status, body) {
|
|
57
70
|
const baseMsg = body.error || `API error: HTTP ${status}`;
|
|
58
71
|
const fieldLines = formatFieldErrors(body.details);
|
|
59
72
|
const msg = fieldLines.length > 0
|
|
60
73
|
? `${baseMsg}\n${fieldLines.map((l) => ` - ${l}`).join("\n")}`
|
|
61
74
|
: baseMsg;
|
|
62
|
-
const
|
|
75
|
+
const serverCode = typeof body.code === "string" ? body.code : undefined;
|
|
76
|
+
// A Pro-gated workspace gets its own exit code so an agent can detect
|
|
77
|
+
// "needs a paid plan" deterministically instead of treating it like an
|
|
78
|
+
// editor-permission 403.
|
|
79
|
+
const exitCode = serverCode === "subscription_required"
|
|
80
|
+
? EXIT_CODES.SUBSCRIPTION
|
|
81
|
+
: exitCodeForStatus(status);
|
|
63
82
|
const resource = typeof body.resource === "string" ? body.resource : undefined;
|
|
64
83
|
const hint = typeof body.hint === "string"
|
|
65
84
|
? body.hint
|
|
66
|
-
:
|
|
85
|
+
: serverCode === "subscription_required"
|
|
86
|
+
? "This workspace needs Pro for CLI/API writes. Start a free trial on its billing page, then retry."
|
|
87
|
+
: hintForStatus(status, baseMsg, resource);
|
|
67
88
|
super(msg, exitCode, hint);
|
|
68
89
|
this.status = status;
|
|
69
90
|
this.body = body;
|
|
70
91
|
this.name = "ApiError";
|
|
92
|
+
this.serverCode = serverCode;
|
|
93
|
+
if (typeof body.upgradeUrl === "string")
|
|
94
|
+
this.upgradeUrl = body.upgradeUrl;
|
|
71
95
|
}
|
|
72
96
|
}
|
|
73
97
|
function exitCodeForStatus(status) {
|
|
@@ -169,6 +193,13 @@ export function handleError(error, json) {
|
|
|
169
193
|
payload.hint = error.hint;
|
|
170
194
|
if (error instanceof ApiError) {
|
|
171
195
|
payload.status = error.status;
|
|
196
|
+
// Surface the server's stable code + action URL so an agent can branch
|
|
197
|
+
// (e.g. serverCode === "subscription_required" → prompt the user to
|
|
198
|
+
// start a trial at upgradeUrl) without scraping the message text.
|
|
199
|
+
if (error.serverCode)
|
|
200
|
+
payload.serverCode = error.serverCode;
|
|
201
|
+
if (error.upgradeUrl)
|
|
202
|
+
payload.upgradeUrl = error.upgradeUrl;
|
|
172
203
|
if (error.body && typeof error.body === "object" && "details" in error.body) {
|
|
173
204
|
payload.details = error.body.details;
|
|
174
205
|
}
|
package/dist/lib/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/lib/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/install-mcp.js
CHANGED
|
@@ -38,9 +38,9 @@ function buildMcpEntry(cfg) {
|
|
|
38
38
|
command: "node",
|
|
39
39
|
args: [getMcpServerPath()],
|
|
40
40
|
env: {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
CNOTES_SERVER: cfg.serverUrl,
|
|
42
|
+
CNOTES_TOKEN: cfg.token,
|
|
43
|
+
CNOTES_WORKSPACE: cfg.workspaceId || "",
|
|
44
44
|
},
|
|
45
45
|
};
|
|
46
46
|
}
|
|
@@ -94,9 +94,9 @@ function installCodex(cfg) {
|
|
|
94
94
|
`args = [${entry.args.map(a => `"${a}"`).join(", ")}]`,
|
|
95
95
|
``,
|
|
96
96
|
`[mcp_servers.cnotes.env]`,
|
|
97
|
-
`
|
|
98
|
-
`
|
|
99
|
-
`
|
|
97
|
+
`CNOTES_SERVER = "${entry.env.CNOTES_SERVER}"`,
|
|
98
|
+
`CNOTES_TOKEN = "${entry.env.CNOTES_TOKEN}"`,
|
|
99
|
+
`CNOTES_WORKSPACE = "${entry.env.CNOTES_WORKSPACE}"`,
|
|
100
100
|
].join("\n");
|
|
101
101
|
let created = true;
|
|
102
102
|
let backedUp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-mcp.js","sourceRoot":"","sources":["../../src/lib/install-mcp.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AACtF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAgBpC,+DAA+D;AAE/D,SAAS,UAAU,CAAC,CAAS;IAC3B,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,mBAAmB;IAC1B,QAAQ,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzB,KAAK,OAAO;YACV,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;QAC1H,KAAK,QAAQ;YACX,OAAO,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,qBAAqB,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;QACtG;YACE,OAAO,OAAO,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;IACjF,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB;IACzB,OAAO,UAAU,CAAC,sBAAsB,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAiB;IAC7C,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,kBAAkB,EAAE,CAAC;AAC5E,CAAC;AAED,+DAA+D;AAE/D,SAAS,gBAAgB;IACvB,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,OAAO,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,aAAa,CAAC,GAAqB;IAC1C,OAAO;QACL,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,CAAC,gBAAgB,EAAE,CAAC;QAC1B,GAAG,EAAE;YACH,
|
|
1
|
+
{"version":3,"file":"install-mcp.js","sourceRoot":"","sources":["../../src/lib/install-mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Relationship-mention linting for note content.
|
|
3
|
+
*
|
|
4
|
+
* A relationship mention is authored inline as `[<target>](relationship:<type>)`
|
|
5
|
+
* where `<target>` is the note being linked — a display ID (`DECISION-116`,
|
|
6
|
+
* `WHATS-APP-3`) or, inside a `notes create` batch, an `@key` placeholder.
|
|
7
|
+
* The parser (lib/tiptap/markdown-extensions.ts) treats the LINK TEXT as the
|
|
8
|
+
* target, so the single most common authoring mistake is writing the
|
|
9
|
+
* relationship VERB as the link text:
|
|
10
|
+
*
|
|
11
|
+
* This [triggers](relationship:triggers) [QUESTION-73: ...](relationship:triggers)
|
|
12
|
+
* ^^^^^^^^^^ — "triggers" becomes a target that resolves to nothing
|
|
13
|
+
*
|
|
14
|
+
* That produces an "Untitled" chip (single-word verb → unresolved mention) or a
|
|
15
|
+
* dead plain link with no edge at all (multi-word verb → fails the mention
|
|
16
|
+
* regex, falls through). Both are silent today. This module makes them loud:
|
|
17
|
+
*
|
|
18
|
+
* - `lintMentionMarkdown` runs BEFORE sending, catching every malformed mention
|
|
19
|
+
* statically (including the multi-word case the server never reports).
|
|
20
|
+
* - `describeUnresolvedMentions` formats the server's post-write
|
|
21
|
+
* `unresolvedMentions` into an actionable diagnostic.
|
|
22
|
+
*
|
|
23
|
+
* Keep the target grammar in sync with the parser tokenizer regex.
|
|
24
|
+
*/
|
|
25
|
+
export interface MentionLintIssue {
|
|
26
|
+
/** The exact offending snippet, e.g. `[Executes](relationship:executes)`. */
|
|
27
|
+
raw: string;
|
|
28
|
+
/** The link text we tried to read as a target, e.g. `Executes`. */
|
|
29
|
+
target: string;
|
|
30
|
+
/** The relationship type, e.g. `executes`. */
|
|
31
|
+
type: string;
|
|
32
|
+
/** Human-readable reason + fix. */
|
|
33
|
+
message: string;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Statically lint one markdown body for malformed relationship mentions.
|
|
37
|
+
*
|
|
38
|
+
* @param markdown note content
|
|
39
|
+
* @param allowAtKey true for `notes create` (batch @key placeholders resolve
|
|
40
|
+
* server-side); false for `versions create` (no batch context).
|
|
41
|
+
*/
|
|
42
|
+
export declare function lintMentionMarkdown(markdown: string, allowAtKey: boolean): MentionLintIssue[];
|
|
43
|
+
export interface UnresolvedMention {
|
|
44
|
+
displayId?: string;
|
|
45
|
+
reason?: string;
|
|
46
|
+
relationshipType?: string;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Format the server's `unresolvedMentions` into an actionable block. Returns
|
|
50
|
+
* null when there's nothing to report.
|
|
51
|
+
*/
|
|
52
|
+
export declare function describeUnresolvedMentions(unresolved: unknown): string | null;
|
|
53
|
+
//# sourceMappingURL=mention-lint.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mention-lint.d.ts","sourceRoot":"","sources":["../../src/lib/mention-lint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,MAAM,WAAW,gBAAgB;IAC/B,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;CACjB;AAcD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,OAAO,GAClB,gBAAgB,EAAE,CA+BpB;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,OAAO,GAClB,MAAM,GAAG,IAAI,CAcf"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Relationship-mention linting for note content.
|
|
3
|
+
*
|
|
4
|
+
* A relationship mention is authored inline as `[<target>](relationship:<type>)`
|
|
5
|
+
* where `<target>` is the note being linked — a display ID (`DECISION-116`,
|
|
6
|
+
* `WHATS-APP-3`) or, inside a `notes create` batch, an `@key` placeholder.
|
|
7
|
+
* The parser (lib/tiptap/markdown-extensions.ts) treats the LINK TEXT as the
|
|
8
|
+
* target, so the single most common authoring mistake is writing the
|
|
9
|
+
* relationship VERB as the link text:
|
|
10
|
+
*
|
|
11
|
+
* This [triggers](relationship:triggers) [QUESTION-73: ...](relationship:triggers)
|
|
12
|
+
* ^^^^^^^^^^ — "triggers" becomes a target that resolves to nothing
|
|
13
|
+
*
|
|
14
|
+
* That produces an "Untitled" chip (single-word verb → unresolved mention) or a
|
|
15
|
+
* dead plain link with no edge at all (multi-word verb → fails the mention
|
|
16
|
+
* regex, falls through). Both are silent today. This module makes them loud:
|
|
17
|
+
*
|
|
18
|
+
* - `lintMentionMarkdown` runs BEFORE sending, catching every malformed mention
|
|
19
|
+
* statically (including the multi-word case the server never reports).
|
|
20
|
+
* - `describeUnresolvedMentions` formats the server's post-write
|
|
21
|
+
* `unresolvedMentions` into an actionable diagnostic.
|
|
22
|
+
*
|
|
23
|
+
* Keep the target grammar in sync with the parser tokenizer regex.
|
|
24
|
+
*/
|
|
25
|
+
/** A display ID: uppercase prefix (may contain hyphens, e.g. WHATS-APP) + -<n>,
|
|
26
|
+
* with an optional `@v<n>` version suffix. */
|
|
27
|
+
const DISPLAY_ID_RE = /^[A-Z][A-Z0-9-]*-\d+(@v\d+)?$/;
|
|
28
|
+
/** An `@key` batch placeholder (only valid inside `notes create`). */
|
|
29
|
+
const AT_KEY_RE = /^@[A-Za-z][\w-]*$/;
|
|
30
|
+
/** Every inline relationship mention, well-formed or not. */
|
|
31
|
+
const MENTION_RE = /\[([^\]]*)\]\(relationship:([^)]*)\)/g;
|
|
32
|
+
/** Extract the target token from link text: the part before an optional `: Title`. */
|
|
33
|
+
function targetOf(linkText) {
|
|
34
|
+
const colon = linkText.indexOf(":");
|
|
35
|
+
return (colon === -1 ? linkText : linkText.slice(0, colon)).trim();
|
|
36
|
+
}
|
|
37
|
+
function isValidTarget(target, allowAtKey) {
|
|
38
|
+
if (DISPLAY_ID_RE.test(target))
|
|
39
|
+
return true;
|
|
40
|
+
if (allowAtKey && AT_KEY_RE.test(target))
|
|
41
|
+
return true;
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Statically lint one markdown body for malformed relationship mentions.
|
|
46
|
+
*
|
|
47
|
+
* @param markdown note content
|
|
48
|
+
* @param allowAtKey true for `notes create` (batch @key placeholders resolve
|
|
49
|
+
* server-side); false for `versions create` (no batch context).
|
|
50
|
+
*/
|
|
51
|
+
export function lintMentionMarkdown(markdown, allowAtKey) {
|
|
52
|
+
const issues = [];
|
|
53
|
+
for (const m of markdown.matchAll(MENTION_RE)) {
|
|
54
|
+
const raw = m[0];
|
|
55
|
+
const linkText = m[1];
|
|
56
|
+
const type = m[2].trim();
|
|
57
|
+
const target = targetOf(linkText);
|
|
58
|
+
if (isValidTarget(target, allowAtKey))
|
|
59
|
+
continue;
|
|
60
|
+
let message;
|
|
61
|
+
if (target.toLowerCase() === type.toLowerCase()) {
|
|
62
|
+
// The classic inversion: the verb got used as the link text.
|
|
63
|
+
message =
|
|
64
|
+
`link text "${target}" is the relationship verb, not a target note. ` +
|
|
65
|
+
`The link text must be the note you're linking TO. ` +
|
|
66
|
+
`Write the verb as plain prose and put the target in the link, e.g.: ` +
|
|
67
|
+
`"This ${type} [DECISION-116: Title](relationship:${type})".`;
|
|
68
|
+
}
|
|
69
|
+
else if (allowAtKey && /^[A-Za-z]/.test(target) && target.includes(" ")) {
|
|
70
|
+
message =
|
|
71
|
+
`link text "${target}" is prose, not a target. A mention links one note: ` +
|
|
72
|
+
`use a display ID or @key, e.g. [DECISION-116: Title](relationship:${type}) ` +
|
|
73
|
+
`or [@somekey: Title](relationship:${type}).`;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
message =
|
|
77
|
+
`link text "${target}" is not a valid target. Use a display ID ` +
|
|
78
|
+
`(e.g. DECISION-116${allowAtKey ? ", or an @key placeholder in this batch" : ""}), ` +
|
|
79
|
+
`optionally with a title: [DECISION-116: Title](relationship:${type}).`;
|
|
80
|
+
}
|
|
81
|
+
issues.push({ raw, target, type, message });
|
|
82
|
+
}
|
|
83
|
+
return issues;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Format the server's `unresolvedMentions` into an actionable block. Returns
|
|
87
|
+
* null when there's nothing to report.
|
|
88
|
+
*/
|
|
89
|
+
export function describeUnresolvedMentions(unresolved) {
|
|
90
|
+
if (!Array.isArray(unresolved) || unresolved.length === 0)
|
|
91
|
+
return null;
|
|
92
|
+
const lines = unresolved.map((u) => {
|
|
93
|
+
const target = u.displayId ?? "(unknown)";
|
|
94
|
+
const type = u.relationshipType ?? "references";
|
|
95
|
+
const looksLikeVerb = typeof u.displayId === "string" &&
|
|
96
|
+
u.displayId.toLowerCase() === type.toLowerCase();
|
|
97
|
+
const why = looksLikeVerb
|
|
98
|
+
? `looks like the relationship verb "${type}" used as link text — the link text must be the target note's ID`
|
|
99
|
+
: `no note "${target}" found in this workspace — check the ID exists and isn't archived`;
|
|
100
|
+
return ` - [${target}](relationship:${type}): ${why}`;
|
|
101
|
+
});
|
|
102
|
+
return lines.join("\n");
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=mention-lint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mention-lint.js","sourceRoot":"","sources":["../../src/lib/mention-lint.ts"],"names":[],"mappings":"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"}
|