agent-recall-core 3.4.37 → 3.4.38
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/README.md +111 -53
- package/dist/helpers/activity-feed.d.ts.map +1 -1
- package/dist/helpers/activity-feed.js +12 -7
- package/dist/helpers/activity-feed.js.map +1 -1
- package/dist/helpers/alignment-patterns.d.ts.map +1 -1
- package/dist/helpers/alignment-patterns.js +8 -13
- package/dist/helpers/alignment-patterns.js.map +1 -1
- package/dist/helpers/handoff.d.ts.map +1 -1
- package/dist/helpers/handoff.js +5 -8
- package/dist/helpers/handoff.js.map +1 -1
- package/dist/helpers/journal-files.d.ts +17 -0
- package/dist/helpers/journal-files.d.ts.map +1 -1
- package/dist/helpers/journal-files.js +61 -0
- package/dist/helpers/journal-files.js.map +1 -1
- package/dist/helpers/journal-filter.d.ts +22 -0
- package/dist/helpers/journal-filter.d.ts.map +1 -1
- package/dist/helpers/journal-filter.js +23 -0
- package/dist/helpers/journal-filter.js.map +1 -1
- package/dist/helpers/journal-name-parser.d.ts +13 -2
- package/dist/helpers/journal-name-parser.d.ts.map +1 -1
- package/dist/helpers/journal-name-parser.js +46 -2
- package/dist/helpers/journal-name-parser.js.map +1 -1
- package/dist/helpers/journal-sig-theme.d.ts +11 -0
- package/dist/helpers/journal-sig-theme.d.ts.map +1 -1
- package/dist/helpers/journal-sig-theme.js +18 -0
- package/dist/helpers/journal-sig-theme.js.map +1 -1
- package/dist/naming.d.ts +10 -3
- package/dist/naming.d.ts.map +1 -1
- package/dist/naming.js +19 -15
- package/dist/naming.js.map +1 -1
- package/dist/palace/pipeline.d.ts +6 -0
- package/dist/palace/pipeline.d.ts.map +1 -1
- package/dist/palace/pipeline.js +15 -2
- package/dist/palace/pipeline.js.map +1 -1
- package/dist/palace/rooms.d.ts +20 -0
- package/dist/palace/rooms.d.ts.map +1 -1
- package/dist/palace/rooms.js +90 -0
- package/dist/palace/rooms.js.map +1 -1
- package/dist/palace/skills.d.ts +13 -0
- package/dist/palace/skills.d.ts.map +1 -1
- package/dist/palace/skills.js +53 -6
- package/dist/palace/skills.js.map +1 -1
- package/dist/storage/ab-experiment.d.ts.map +1 -1
- package/dist/storage/ab-experiment.js +8 -12
- package/dist/storage/ab-experiment.js.map +1 -1
- package/dist/storage/corrections.d.ts +18 -0
- package/dist/storage/corrections.d.ts.map +1 -1
- package/dist/storage/corrections.js +211 -31
- package/dist/storage/corrections.js.map +1 -1
- package/dist/storage/cwd-allowlist.d.ts.map +1 -1
- package/dist/storage/cwd-allowlist.js +2 -4
- package/dist/storage/cwd-allowlist.js.map +1 -1
- package/dist/storage/memory-protocol.d.ts.map +1 -1
- package/dist/storage/memory-protocol.js +6 -10
- package/dist/storage/memory-protocol.js.map +1 -1
- package/dist/storage/paths.d.ts +120 -1
- package/dist/storage/paths.d.ts.map +1 -1
- package/dist/storage/paths.js +145 -31
- package/dist/storage/paths.js.map +1 -1
- package/dist/storage/project.d.ts.map +1 -1
- package/dist/storage/project.js +12 -4
- package/dist/storage/project.js.map +1 -1
- package/dist/storage/sanitize.d.ts +54 -0
- package/dist/storage/sanitize.d.ts.map +1 -0
- package/dist/storage/sanitize.js +97 -0
- package/dist/storage/sanitize.js.map +1 -0
- package/dist/storage/session.d.ts +12 -3
- package/dist/storage/session.d.ts.map +1 -1
- package/dist/storage/session.js +45 -8
- package/dist/storage/session.js.map +1 -1
- package/dist/tools-logic/bootstrap.d.ts.map +1 -1
- package/dist/tools-logic/bootstrap.js +2 -4
- package/dist/tools-logic/bootstrap.js.map +1 -1
- package/dist/tools-logic/check.d.ts.map +1 -1
- package/dist/tools-logic/check.js +5 -8
- package/dist/tools-logic/check.js.map +1 -1
- package/dist/tools-logic/export-corrections.js +2 -2
- package/dist/tools-logic/export-corrections.js.map +1 -1
- package/dist/tools-logic/journal-capture.d.ts.map +1 -1
- package/dist/tools-logic/journal-capture.js +53 -36
- package/dist/tools-logic/journal-capture.js.map +1 -1
- package/dist/tools-logic/journal-write.d.ts.map +1 -1
- package/dist/tools-logic/journal-write.js +51 -28
- package/dist/tools-logic/journal-write.js.map +1 -1
- package/dist/tools-logic/knowledge-read.d.ts.map +1 -1
- package/dist/tools-logic/knowledge-read.js +8 -6
- package/dist/tools-logic/knowledge-read.js.map +1 -1
- package/dist/tools-logic/knowledge-write.d.ts.map +1 -1
- package/dist/tools-logic/knowledge-write.js +5 -8
- package/dist/tools-logic/knowledge-write.js.map +1 -1
- package/dist/tools-logic/palace-write.d.ts.map +1 -1
- package/dist/tools-logic/palace-write.js +5 -1
- package/dist/tools-logic/palace-write.js.map +1 -1
- package/dist/tools-logic/project-board.js +2 -2
- package/dist/tools-logic/project-board.js.map +1 -1
- package/dist/tools-logic/session-end.d.ts.map +1 -1
- package/dist/tools-logic/session-end.js +9 -4
- package/dist/tools-logic/session-end.js.map +1 -1
- package/dist/tools-logic/session-start.d.ts.map +1 -1
- package/dist/tools-logic/session-start.js +5 -4
- package/dist/tools-logic/session-start.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.js +1 -1
- package/dist/vector/local-vector-store.d.ts.map +1 -1
- package/dist/vector/local-vector-store.js +5 -4
- package/dist/vector/local-vector-store.js.map +1 -1
- package/package.json +1 -1
package/dist/storage/paths.d.ts
CHANGED
|
@@ -7,12 +7,131 @@
|
|
|
7
7
|
*/
|
|
8
8
|
/**
|
|
9
9
|
* Sanitize a project name for safe use in path.join().
|
|
10
|
-
*
|
|
10
|
+
*
|
|
11
|
+
* naming-v2 spec §2 (bug #1 — case-fold divergence): now lowercases + NFC +
|
|
12
|
+
* byte-caps via the shared sanitizer, instead of the old char-slice that
|
|
13
|
+
* preserved case. Strips ALL non-alphanumeric chars (including dots) to
|
|
14
|
+
* prevent ".." traversal, same as before.
|
|
15
|
+
*
|
|
16
|
+
* This function is PURE (no filesystem access) — it does not know whether a
|
|
17
|
+
* differently-cased directory for this project already exists on disk. Path
|
|
18
|
+
* builders below call `resolveProjectDirName()` to apply the v2
|
|
19
|
+
* EXISTING-DIR-REUSE rule on top of this before touching the filesystem.
|
|
11
20
|
*
|
|
12
21
|
* Exported so other modules (bootstrap, etc.) share the same hardened slug
|
|
13
22
|
* grammar instead of rolling their own. Future-proofing against drift.
|
|
14
23
|
*/
|
|
15
24
|
export declare function sanitizeProject(project: string): string;
|
|
25
|
+
/**
|
|
26
|
+
* v2 EXISTING-DIR REUSE RULE (naming-v2 spec §2, bug #1).
|
|
27
|
+
*
|
|
28
|
+
* `sanitizeProject` now lowercases, which would otherwise SPLIT an existing
|
|
29
|
+
* project directory the moment a caller passes a differently-cased name:
|
|
30
|
+
* "projects/AgentRecall" and "projects/agentrecall" are ONE inode on
|
|
31
|
+
* default (case-insensitive) APFS but become two silently-diverging
|
|
32
|
+
* directories on any case-sensitive filesystem (Linux prod, ext4 Docker, CI).
|
|
33
|
+
*
|
|
34
|
+
* Before resolving a project's directory, check whether a dir already
|
|
35
|
+
* exists under `projects/` that matches the sanitized slug
|
|
36
|
+
* case-INSENSITIVELY — if so, reuse that dir's EXACT on-disk casing for both
|
|
37
|
+
* reads and writes. Only a genuinely brand-new project (no existing dir
|
|
38
|
+
* under any casing) gets the new lowercased slug. This is a NEW-WRITES-ONLY
|
|
39
|
+
* concern in spirit (no existing file is ever renamed) — it just prevents
|
|
40
|
+
* new writes for an old project from starting a second, diverging directory.
|
|
41
|
+
*
|
|
42
|
+
* F1 fix (independent review, 2026-07-20): when MORE THAN ONE case-variant
|
|
43
|
+
* directory already exists for the same sanitized slug (e.g. both
|
|
44
|
+
* "AgentRecall" AND "agentrecall" already diverged on disk before this file
|
|
45
|
+
* shipped, or on a case-sensitive filesystem where two callers raced), the
|
|
46
|
+
* old `entries.find()` returned whichever entry `readdirSync()` happened to
|
|
47
|
+
* list first — filesystem/OS-dependent, NON-DETERMINISTIC across machines
|
|
48
|
+
* and even across repeated calls on some platforms. Resolution order is now:
|
|
49
|
+
* 1. An EXACT (byte-for-byte) match for the sanitized name wins outright —
|
|
50
|
+
* no ambiguity to resolve.
|
|
51
|
+
* 2. Exactly one case-insensitive match — use it (the common case).
|
|
52
|
+
* 3. Multiple case-variant matches — pick the LEXICOGRAPHICALLY FIRST
|
|
53
|
+
* (deterministic across machines and process restarts) and emit a
|
|
54
|
+
* one-line warning to stderr (never stdout — this runs under MCP
|
|
55
|
+
* stdio, and writing to stdout would corrupt the JSON-RPC stream)
|
|
56
|
+
* naming every variant found plus the one picked. Best-effort: a
|
|
57
|
+
* failed warning write must never throw.
|
|
58
|
+
*
|
|
59
|
+
* Best-effort: any fs error (missing root, permissions) falls through to the
|
|
60
|
+
* plain sanitized slug — a directory resolver must never throw.
|
|
61
|
+
*/
|
|
62
|
+
export interface CaseVariantResolution {
|
|
63
|
+
/** The entry to actually use. */
|
|
64
|
+
picked: string;
|
|
65
|
+
/** Every case-insensitive match found (sorted when `ambiguous`). */
|
|
66
|
+
variants: string[];
|
|
67
|
+
/** true when MORE THAN ONE case-variant matched and a pick had to be made. */
|
|
68
|
+
ambiguous: boolean;
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Pure resolution logic (F1 fix, independent review 2026-07-20), extracted
|
|
72
|
+
* from `resolveProjectDirName` so the exact/ambiguous/lexicographic-pick
|
|
73
|
+
* decision is unit-testable against a plain string array — real directories
|
|
74
|
+
* differing only by case cannot be fabricated for a test on the default
|
|
75
|
+
* case-insensitive-but-case-preserving filesystem this suite runs on (macOS
|
|
76
|
+
* APFS: a second `mkdirSync` for a case-variant of an existing dir silently
|
|
77
|
+
* collides with the first). `entries` is whatever `fs.readdirSync()` returned
|
|
78
|
+
* for `projects/`. Returns `null` when nothing matches (caller falls back to
|
|
79
|
+
* the plain sanitized slug — a brand-new project).
|
|
80
|
+
*/
|
|
81
|
+
export declare function pickProjectDirEntry(sanitized: string, entries: string[]): CaseVariantResolution | null;
|
|
82
|
+
export declare function resolveProjectDirName(root: string, project: string): string;
|
|
83
|
+
/**
|
|
84
|
+
* Pure grouping logic for `listCaseVariantForks` — extracted for the same
|
|
85
|
+
* fs-free testability reason as `pickProjectDirEntry` above.
|
|
86
|
+
*/
|
|
87
|
+
export declare function groupCaseVariantForks(entries: string[]): Array<{
|
|
88
|
+
project: string;
|
|
89
|
+
variants: string[];
|
|
90
|
+
}>;
|
|
91
|
+
/**
|
|
92
|
+
* Read-only diagnostic (F1 follow-up, independent review 2026-07-20): scan
|
|
93
|
+
* `root/projects` for every sanitized-slug bucket that has MORE THAN ONE
|
|
94
|
+
* on-disk case-variant directory. Exported for a future store-doctor
|
|
95
|
+
* command to surface/merge these forks — NOT wired to any write path today.
|
|
96
|
+
* Never throws; returns [] on any fs error or when there is no fork.
|
|
97
|
+
*/
|
|
98
|
+
export declare function listCaseVariantForks(root: string): Array<{
|
|
99
|
+
project: string;
|
|
100
|
+
variants: string[];
|
|
101
|
+
}>;
|
|
102
|
+
/**
|
|
103
|
+
* Canonical directory name for all per-project storage under the
|
|
104
|
+
* AgentRecall root. Exported (F2 fix, independent review 2026-07-20) so no
|
|
105
|
+
* OTHER module ever needs to inline the literal "projects" — every call site
|
|
106
|
+
* that did was a call-site divergence risk: routing a project-specific
|
|
107
|
+
* sub-path through a hand-rolled `path.join(root, "projects", <slug>, ...)`
|
|
108
|
+
* silently skips the resolveProjectDirName EXISTING-DIR reuse rule above,
|
|
109
|
+
* reintroducing the exact case-fold-split bug this file exists to prevent.
|
|
110
|
+
* `projectsRootDir()` / `projectSubPath()` below are the two sanctioned ways
|
|
111
|
+
* to reference this segment from anywhere else in the package.
|
|
112
|
+
*/
|
|
113
|
+
export declare const PROJECTS_DIRNAME = "projects";
|
|
114
|
+
/**
|
|
115
|
+
* The root directory containing every project's storage (read-only
|
|
116
|
+
* enumeration use only — e.g. `fs.readdirSync(projectsRootDir())` to list
|
|
117
|
+
* all known project slugs). Callers that already HOLD a specific on-disk
|
|
118
|
+
* slug (from such a readdir) should join directly against this — there is
|
|
119
|
+
* no case-fold-divergence risk when the slug came FROM disk. Callers that
|
|
120
|
+
* have a caller-SUPPLIED project name and want ITS directory must use
|
|
121
|
+
* `projectSubPath()` instead, so the EXISTING-DIR reuse rule applies.
|
|
122
|
+
*/
|
|
123
|
+
export declare function projectsRootDir(): string;
|
|
124
|
+
/**
|
|
125
|
+
* Resolve an absolute path under a project's directory, applying the v2
|
|
126
|
+
* EXISTING-DIR reuse rule (resolveProjectDirName) and the path-escape guard
|
|
127
|
+
* (assertInsideRoot) exactly once. This is the ONE sanctioned way for any
|
|
128
|
+
* module outside this file to build a project-specific path — every
|
|
129
|
+
* `journalDir`/`palaceDir`/etc. helper below is defined in terms of it.
|
|
130
|
+
*
|
|
131
|
+
* `projectSubPath(project)` (no extra segments) returns the project's own
|
|
132
|
+
* root directory (`projects/<safe>`).
|
|
133
|
+
*/
|
|
134
|
+
export declare function projectSubPath(project: string, ...segments: string[]): string;
|
|
16
135
|
/**
|
|
17
136
|
* Resolve the journal directory for a project.
|
|
18
137
|
* For writes, always use the new location.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/storage/paths.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/storage/paths.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,WAAW,qBAAqB;IACpC,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,oEAAoE;IACpE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8EAA8E;IAC9E,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,qBAAqB,GAAG,IAAI,CAatG;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAuB3E;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAavG;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,CAQjG;AAaD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB,aAAa,CAAC;AAE3C;;;;;;;;GAQG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAM7E;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,MAAM,EAAE,CAwC7E;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKjE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOlD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,CAExC"}
|
package/dist/storage/paths.js
CHANGED
|
@@ -8,9 +8,19 @@
|
|
|
8
8
|
import * as fs from "node:fs";
|
|
9
9
|
import * as path from "node:path";
|
|
10
10
|
import { getRoot, getLegacyRoot } from "../types.js";
|
|
11
|
+
import { sanitizeName } from "./sanitize.js";
|
|
11
12
|
/**
|
|
12
13
|
* Sanitize a project name for safe use in path.join().
|
|
13
|
-
*
|
|
14
|
+
*
|
|
15
|
+
* naming-v2 spec §2 (bug #1 — case-fold divergence): now lowercases + NFC +
|
|
16
|
+
* byte-caps via the shared sanitizer, instead of the old char-slice that
|
|
17
|
+
* preserved case. Strips ALL non-alphanumeric chars (including dots) to
|
|
18
|
+
* prevent ".." traversal, same as before.
|
|
19
|
+
*
|
|
20
|
+
* This function is PURE (no filesystem access) — it does not know whether a
|
|
21
|
+
* differently-cased directory for this project already exists on disk. Path
|
|
22
|
+
* builders below call `resolveProjectDirName()` to apply the v2
|
|
23
|
+
* EXISTING-DIR-REUSE rule on top of this before touching the filesystem.
|
|
14
24
|
*
|
|
15
25
|
* Exported so other modules (bootstrap, etc.) share the same hardened slug
|
|
16
26
|
* grammar instead of rolling their own. Future-proofing against drift.
|
|
@@ -18,11 +28,94 @@ import { getRoot, getLegacyRoot } from "../types.js";
|
|
|
18
28
|
export function sanitizeProject(project) {
|
|
19
29
|
if (!project)
|
|
20
30
|
return "unnamed";
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
31
|
+
return sanitizeName(project, 100);
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Pure resolution logic (F1 fix, independent review 2026-07-20), extracted
|
|
35
|
+
* from `resolveProjectDirName` so the exact/ambiguous/lexicographic-pick
|
|
36
|
+
* decision is unit-testable against a plain string array — real directories
|
|
37
|
+
* differing only by case cannot be fabricated for a test on the default
|
|
38
|
+
* case-insensitive-but-case-preserving filesystem this suite runs on (macOS
|
|
39
|
+
* APFS: a second `mkdirSync` for a case-variant of an existing dir silently
|
|
40
|
+
* collides with the first). `entries` is whatever `fs.readdirSync()` returned
|
|
41
|
+
* for `projects/`. Returns `null` when nothing matches (caller falls back to
|
|
42
|
+
* the plain sanitized slug — a brand-new project).
|
|
43
|
+
*/
|
|
44
|
+
export function pickProjectDirEntry(sanitized, entries) {
|
|
45
|
+
const matches = entries.filter((e) => e.toLowerCase() === sanitized.toLowerCase());
|
|
46
|
+
if (matches.length === 0)
|
|
47
|
+
return null;
|
|
48
|
+
const exact = matches.find((e) => e === sanitized);
|
|
49
|
+
if (exact)
|
|
50
|
+
return { picked: exact, variants: matches, ambiguous: false };
|
|
51
|
+
if (matches.length === 1)
|
|
52
|
+
return { picked: matches[0], variants: matches, ambiguous: false };
|
|
53
|
+
// Multiple case-variant directories for the same slug — deterministic
|
|
54
|
+
// lexicographic pick.
|
|
55
|
+
const sorted = [...matches].sort();
|
|
56
|
+
return { picked: sorted[0], variants: sorted, ambiguous: true };
|
|
57
|
+
}
|
|
58
|
+
export function resolveProjectDirName(root, project) {
|
|
59
|
+
const sanitized = sanitizeProject(project);
|
|
60
|
+
try {
|
|
61
|
+
const projectsRoot = path.join(root, "projects");
|
|
62
|
+
const entries = fs.readdirSync(projectsRoot);
|
|
63
|
+
const resolution = pickProjectDirEntry(sanitized, entries);
|
|
64
|
+
if (!resolution)
|
|
65
|
+
return sanitized;
|
|
66
|
+
if (resolution.ambiguous) {
|
|
67
|
+
try {
|
|
68
|
+
process.stderr.write(`[agent-recall] WARNING: ${resolution.variants.length} case-variant project directories found for ` +
|
|
69
|
+
`"${sanitized}" (${resolution.variants.join(", ")}) — using "${resolution.picked}" deterministically. ` +
|
|
70
|
+
`Consider merging these directories.\n`);
|
|
71
|
+
}
|
|
72
|
+
catch {
|
|
73
|
+
// a failed diagnostic write must never break resolution
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return resolution.picked;
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return sanitized;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Pure grouping logic for `listCaseVariantForks` — extracted for the same
|
|
84
|
+
* fs-free testability reason as `pickProjectDirEntry` above.
|
|
85
|
+
*/
|
|
86
|
+
export function groupCaseVariantForks(entries) {
|
|
87
|
+
const buckets = new Map();
|
|
88
|
+
for (const entry of entries) {
|
|
89
|
+
const key = entry.toLowerCase();
|
|
90
|
+
const arr = buckets.get(key);
|
|
91
|
+
if (arr)
|
|
92
|
+
arr.push(entry);
|
|
93
|
+
else
|
|
94
|
+
buckets.set(key, [entry]);
|
|
95
|
+
}
|
|
96
|
+
const forks = [];
|
|
97
|
+
for (const [project, variants] of buckets) {
|
|
98
|
+
if (variants.length > 1)
|
|
99
|
+
forks.push({ project, variants: [...variants].sort() });
|
|
100
|
+
}
|
|
101
|
+
return forks.sort((a, b) => a.project.localeCompare(b.project));
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Read-only diagnostic (F1 follow-up, independent review 2026-07-20): scan
|
|
105
|
+
* `root/projects` for every sanitized-slug bucket that has MORE THAN ONE
|
|
106
|
+
* on-disk case-variant directory. Exported for a future store-doctor
|
|
107
|
+
* command to surface/merge these forks — NOT wired to any write path today.
|
|
108
|
+
* Never throws; returns [] on any fs error or when there is no fork.
|
|
109
|
+
*/
|
|
110
|
+
export function listCaseVariantForks(root) {
|
|
111
|
+
try {
|
|
112
|
+
const projectsRoot = path.join(root, "projects");
|
|
113
|
+
const entries = fs.readdirSync(projectsRoot);
|
|
114
|
+
return groupCaseVariantForks(entries);
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return [];
|
|
118
|
+
}
|
|
26
119
|
}
|
|
27
120
|
/**
|
|
28
121
|
* Check that `resolved` is strictly inside `root` (rejects prefix matches like
|
|
@@ -35,16 +128,53 @@ function assertInsideRoot(resolved, root, project) {
|
|
|
35
128
|
}
|
|
36
129
|
}
|
|
37
130
|
/**
|
|
38
|
-
*
|
|
39
|
-
*
|
|
131
|
+
* Canonical directory name for all per-project storage under the
|
|
132
|
+
* AgentRecall root. Exported (F2 fix, independent review 2026-07-20) so no
|
|
133
|
+
* OTHER module ever needs to inline the literal "projects" — every call site
|
|
134
|
+
* that did was a call-site divergence risk: routing a project-specific
|
|
135
|
+
* sub-path through a hand-rolled `path.join(root, "projects", <slug>, ...)`
|
|
136
|
+
* silently skips the resolveProjectDirName EXISTING-DIR reuse rule above,
|
|
137
|
+
* reintroducing the exact case-fold-split bug this file exists to prevent.
|
|
138
|
+
* `projectsRootDir()` / `projectSubPath()` below are the two sanctioned ways
|
|
139
|
+
* to reference this segment from anywhere else in the package.
|
|
40
140
|
*/
|
|
41
|
-
export
|
|
42
|
-
|
|
141
|
+
export const PROJECTS_DIRNAME = "projects";
|
|
142
|
+
/**
|
|
143
|
+
* The root directory containing every project's storage (read-only
|
|
144
|
+
* enumeration use only — e.g. `fs.readdirSync(projectsRootDir())` to list
|
|
145
|
+
* all known project slugs). Callers that already HOLD a specific on-disk
|
|
146
|
+
* slug (from such a readdir) should join directly against this — there is
|
|
147
|
+
* no case-fold-divergence risk when the slug came FROM disk. Callers that
|
|
148
|
+
* have a caller-SUPPLIED project name and want ITS directory must use
|
|
149
|
+
* `projectSubPath()` instead, so the EXISTING-DIR reuse rule applies.
|
|
150
|
+
*/
|
|
151
|
+
export function projectsRootDir() {
|
|
152
|
+
return path.join(getRoot(), PROJECTS_DIRNAME);
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Resolve an absolute path under a project's directory, applying the v2
|
|
156
|
+
* EXISTING-DIR reuse rule (resolveProjectDirName) and the path-escape guard
|
|
157
|
+
* (assertInsideRoot) exactly once. This is the ONE sanctioned way for any
|
|
158
|
+
* module outside this file to build a project-specific path — every
|
|
159
|
+
* `journalDir`/`palaceDir`/etc. helper below is defined in terms of it.
|
|
160
|
+
*
|
|
161
|
+
* `projectSubPath(project)` (no extra segments) returns the project's own
|
|
162
|
+
* root directory (`projects/<safe>`).
|
|
163
|
+
*/
|
|
164
|
+
export function projectSubPath(project, ...segments) {
|
|
43
165
|
const root = getRoot();
|
|
44
|
-
const
|
|
166
|
+
const safe = resolveProjectDirName(root, project);
|
|
167
|
+
const resolved = path.join(root, PROJECTS_DIRNAME, safe, ...segments);
|
|
45
168
|
assertInsideRoot(resolved, root, project);
|
|
46
169
|
return resolved;
|
|
47
170
|
}
|
|
171
|
+
/**
|
|
172
|
+
* Resolve the journal directory for a project.
|
|
173
|
+
* For writes, always use the new location.
|
|
174
|
+
*/
|
|
175
|
+
export function journalDir(project) {
|
|
176
|
+
return projectSubPath(project, "journal");
|
|
177
|
+
}
|
|
48
178
|
/**
|
|
49
179
|
* Find all journal directories for a project (new + legacy fallback).
|
|
50
180
|
*
|
|
@@ -99,11 +229,7 @@ export function journalDirs(project, includeArchive = false) {
|
|
|
99
229
|
* Resolve the palace directory for a project.
|
|
100
230
|
*/
|
|
101
231
|
export function palaceDir(project) {
|
|
102
|
-
|
|
103
|
-
const root = getRoot();
|
|
104
|
-
const resolved = path.join(root, "projects", safe, "palace");
|
|
105
|
-
assertInsideRoot(resolved, root, project);
|
|
106
|
-
return resolved;
|
|
232
|
+
return projectSubPath(project, "palace");
|
|
107
233
|
}
|
|
108
234
|
/**
|
|
109
235
|
* Resolve a room directory within a project's palace.
|
|
@@ -132,11 +258,7 @@ export function sanitizeSlug(input) {
|
|
|
132
258
|
* Resolve the digest directory for a project.
|
|
133
259
|
*/
|
|
134
260
|
export function digestDir(project) {
|
|
135
|
-
|
|
136
|
-
const root = getRoot();
|
|
137
|
-
const resolved = path.join(root, "projects", safe, "digest");
|
|
138
|
-
assertInsideRoot(resolved, root, project);
|
|
139
|
-
return resolved;
|
|
261
|
+
return projectSubPath(project, "digest");
|
|
140
262
|
}
|
|
141
263
|
/**
|
|
142
264
|
* Resolve the lossless raw-archive directory for a project (Wave 2).
|
|
@@ -146,11 +268,7 @@ export function digestDir(project) {
|
|
|
146
268
|
* the lossy compression tier (awareness / palace skills).
|
|
147
269
|
*/
|
|
148
270
|
export function archiveRawDir(project) {
|
|
149
|
-
|
|
150
|
-
const root = getRoot();
|
|
151
|
-
const resolved = path.join(root, "projects", safe, "journal", "archive", "raw");
|
|
152
|
-
assertInsideRoot(resolved, root, project);
|
|
153
|
-
return resolved;
|
|
271
|
+
return projectSubPath(project, "journal", "archive", "raw");
|
|
154
272
|
}
|
|
155
273
|
/**
|
|
156
274
|
* Resolve the personal-tier directory for a project (Wave 5).
|
|
@@ -162,11 +280,7 @@ export function archiveRawDir(project) {
|
|
|
162
280
|
* scanned by autoBackfill (which only walks journal + palace/rooms).
|
|
163
281
|
*/
|
|
164
282
|
export function personalDir(project) {
|
|
165
|
-
|
|
166
|
-
const root = getRoot();
|
|
167
|
-
const resolved = path.join(root, "projects", safe, "personal");
|
|
168
|
-
assertInsideRoot(resolved, root, project);
|
|
169
|
-
return resolved;
|
|
283
|
+
return projectSubPath(project, "personal");
|
|
170
284
|
}
|
|
171
285
|
/**
|
|
172
286
|
* Resolve the global (cross-project) digest directory.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/storage/paths.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/storage/paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/storage/project.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/storage/project.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAwB/C;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAyBxD;AAED;;;;GAIG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CA+ErD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CA6CjF;AAaD;;GAEG;AACH,wBAAgB,eAAe,IAAI,WAAW,EAAE,CAuD/C"}
|
package/dist/storage/project.js
CHANGED
|
@@ -5,7 +5,8 @@ import * as fs from "node:fs";
|
|
|
5
5
|
import * as path from "node:path";
|
|
6
6
|
import { execFile } from "node:child_process";
|
|
7
7
|
import { promisify } from "node:util";
|
|
8
|
-
import {
|
|
8
|
+
import { getLegacyRoot } from "../types.js";
|
|
9
|
+
import { projectsRootDir } from "./paths.js";
|
|
9
10
|
const execFileAsync = promisify(execFile);
|
|
10
11
|
/**
|
|
11
12
|
* Common directory names that are not valid project slugs.
|
|
@@ -167,7 +168,13 @@ export async function resolveProject(project) {
|
|
|
167
168
|
const detected = await detectProject();
|
|
168
169
|
// Gate: block auto-detected slugs from creating new dirs if invalid
|
|
169
170
|
if (!isValidProjectSlug(detected)) {
|
|
170
|
-
|
|
171
|
+
// Deliberately NOT routed through projectSubPath()/resolveProjectDirName:
|
|
172
|
+
// this is a raw existence probe for an ALREADY-INVALID slug (blocks new-dir
|
|
173
|
+
// creation unless legacy data already exists at this exact name) — running
|
|
174
|
+
// it through the sanitizing resolver would change what "exists" means for
|
|
175
|
+
// exactly the malformed inputs this gate exists to catch. Only the literal
|
|
176
|
+
// "projects" segment is routed through paths.ts (F2 fix, 2026-07-20).
|
|
177
|
+
const projectDir = path.join(projectsRootDir(), detected);
|
|
171
178
|
if (!fs.existsSync(projectDir)) {
|
|
172
179
|
throw new Error(`Auto-detected project slug "${detected}" is invalid (UUID, system dir, or deny-listed). ` +
|
|
173
180
|
`Set AGENT_RECALL_PROJECT env var or pass project explicitly.`);
|
|
@@ -178,7 +185,8 @@ export async function resolveProject(project) {
|
|
|
178
185
|
}
|
|
179
186
|
// Explicit slug: validate before allowing new directory creation
|
|
180
187
|
if (!isValidProjectSlug(project)) {
|
|
181
|
-
|
|
188
|
+
// See comment above — deliberately raw, not routed through resolveProjectDirName.
|
|
189
|
+
const projectDir = path.join(projectsRootDir(), project);
|
|
182
190
|
if (!fs.existsSync(projectDir)) {
|
|
183
191
|
throw new Error(`Invalid project slug "${project}". Slugs must contain at least one letter ` +
|
|
184
192
|
`and cannot be UUIDs, end with .md, start with _, or be a reserved word ` +
|
|
@@ -215,7 +223,7 @@ function isJournalFile(f) {
|
|
|
215
223
|
export function listAllProjects() {
|
|
216
224
|
const projects = new Map();
|
|
217
225
|
// New location
|
|
218
|
-
const projectsDir =
|
|
226
|
+
const projectsDir = projectsRootDir();
|
|
219
227
|
if (fs.existsSync(projectsDir)) {
|
|
220
228
|
const dirs = fs.readdirSync(projectsDir);
|
|
221
229
|
for (const slug of dirs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/storage/project.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/storage/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Naming System v2 — shared sanitizer (Wave 1).
|
|
3
|
+
*
|
|
4
|
+
* ONE function used by naming.ts, session.ts, corrections.ts, and paths.ts
|
|
5
|
+
* (project-level slugs) — call-site divergence was the source of two live
|
|
6
|
+
* bugs (docs/proposals/2026-07-20-naming-v2-spec.md §2).
|
|
7
|
+
* NOT yet adopted by room/topic-level slugs (`sanitizeSlug` in paths.ts,
|
|
8
|
+
* palace/rooms.ts): those remain case-PRESERVING, so room-level case-fold
|
|
9
|
+
* divergence on case-sensitive filesystems is still possible — tracked as a
|
|
10
|
+
* v2.1 item in the spec (§7); lowercasing them retroactively would re-case
|
|
11
|
+
* existing topic files (e.g. README.md) with no existing-dir-reuse safety
|
|
12
|
+
* net. Bugs closed in v2.0:
|
|
13
|
+
*
|
|
14
|
+
* 1. Case-fold divergence: `sanitizeProject`/`sanitizeSlug` never lowercased,
|
|
15
|
+
* so "projects/agentrecall" and "projects/AgentRecall" are one inode on
|
|
16
|
+
* default (case-insensitive) APFS but silently diverge into two dirs on
|
|
17
|
+
* any case-sensitive filesystem (Linux prod, ext4 Docker, CI).
|
|
18
|
+
* 2. Byte-vs-char budget: every `.slice(N)` capped UTF-16 code units, so a
|
|
19
|
+
* CJK/emoji slug could pass the char cap yet exceed the 255-byte
|
|
20
|
+
* filesystem component limit.
|
|
21
|
+
*
|
|
22
|
+
* Grammar: lowercase → Unicode NFC → collapse any run of non-`[a-z0-9-]`
|
|
23
|
+
* characters (INCLUDING existing runs of "-" itself) to a single "-" → trim
|
|
24
|
+
* leading/trailing "-" → byte-cap (never split a multi-byte codepoint) →
|
|
25
|
+
* fallback "unnamed" for an empty result.
|
|
26
|
+
*
|
|
27
|
+
* INVARIANT: the output never contains "--". This is what lets v2 filename
|
|
28
|
+
* parsers use "--" as an unambiguous field delimiter — no well-formed slug
|
|
29
|
+
* component can be mistaken for a field boundary.
|
|
30
|
+
*/
|
|
31
|
+
/**
|
|
32
|
+
* Byte-safe truncation of arbitrary text (NOT necessarily already
|
|
33
|
+
* ASCII-sanitized — this is also exported standalone for callers that need
|
|
34
|
+
* to byte-cap raw, possibly multi-byte content without running it through
|
|
35
|
+
* the ASCII-collapsing `sanitizeName` pipeline).
|
|
36
|
+
*
|
|
37
|
+
* Walks the string one Unicode codepoint at a time (so a surrogate pair is
|
|
38
|
+
* never split mid-character) accumulating UTF-8 byte length, and stops
|
|
39
|
+
* BEFORE the codepoint that would exceed `maxBytes`. When the resulting hard
|
|
40
|
+
* cut lands within 8 bytes of a "-" character, prefers cutting at that "-"
|
|
41
|
+
* instead (word-boundary preference) — but only when doing so doesn't throw
|
|
42
|
+
* away the entire result. Pure string op; never throws.
|
|
43
|
+
*/
|
|
44
|
+
export declare function byteCap(input: string, maxBytes: number): string;
|
|
45
|
+
/**
|
|
46
|
+
* Sanitize free text into a v2-grammar-safe name component.
|
|
47
|
+
*
|
|
48
|
+
* lowercase → NFC → collapse any run of characters outside `[a-z0-9-]`
|
|
49
|
+
* (including runs of the separator "-" itself, e.g. a literal "--" in the
|
|
50
|
+
* input) into a single "-" → trim leading/trailing "-" → byte-cap →
|
|
51
|
+
* fallback "unnamed" when the result is empty.
|
|
52
|
+
*/
|
|
53
|
+
export declare function sanitizeName(input: string, maxBytes?: number): string;
|
|
54
|
+
//# sourceMappingURL=sanitize.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/storage/sanitize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH;;;;;;;;;;;;GAYG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAgC/D;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,SAAM,GAAG,MAAM,CAUlE"}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Naming System v2 — shared sanitizer (Wave 1).
|
|
3
|
+
*
|
|
4
|
+
* ONE function used by naming.ts, session.ts, corrections.ts, and paths.ts
|
|
5
|
+
* (project-level slugs) — call-site divergence was the source of two live
|
|
6
|
+
* bugs (docs/proposals/2026-07-20-naming-v2-spec.md §2).
|
|
7
|
+
* NOT yet adopted by room/topic-level slugs (`sanitizeSlug` in paths.ts,
|
|
8
|
+
* palace/rooms.ts): those remain case-PRESERVING, so room-level case-fold
|
|
9
|
+
* divergence on case-sensitive filesystems is still possible — tracked as a
|
|
10
|
+
* v2.1 item in the spec (§7); lowercasing them retroactively would re-case
|
|
11
|
+
* existing topic files (e.g. README.md) with no existing-dir-reuse safety
|
|
12
|
+
* net. Bugs closed in v2.0:
|
|
13
|
+
*
|
|
14
|
+
* 1. Case-fold divergence: `sanitizeProject`/`sanitizeSlug` never lowercased,
|
|
15
|
+
* so "projects/agentrecall" and "projects/AgentRecall" are one inode on
|
|
16
|
+
* default (case-insensitive) APFS but silently diverge into two dirs on
|
|
17
|
+
* any case-sensitive filesystem (Linux prod, ext4 Docker, CI).
|
|
18
|
+
* 2. Byte-vs-char budget: every `.slice(N)` capped UTF-16 code units, so a
|
|
19
|
+
* CJK/emoji slug could pass the char cap yet exceed the 255-byte
|
|
20
|
+
* filesystem component limit.
|
|
21
|
+
*
|
|
22
|
+
* Grammar: lowercase → Unicode NFC → collapse any run of non-`[a-z0-9-]`
|
|
23
|
+
* characters (INCLUDING existing runs of "-" itself) to a single "-" → trim
|
|
24
|
+
* leading/trailing "-" → byte-cap (never split a multi-byte codepoint) →
|
|
25
|
+
* fallback "unnamed" for an empty result.
|
|
26
|
+
*
|
|
27
|
+
* INVARIANT: the output never contains "--". This is what lets v2 filename
|
|
28
|
+
* parsers use "--" as an unambiguous field delimiter — no well-formed slug
|
|
29
|
+
* component can be mistaken for a field boundary.
|
|
30
|
+
*/
|
|
31
|
+
/**
|
|
32
|
+
* Byte-safe truncation of arbitrary text (NOT necessarily already
|
|
33
|
+
* ASCII-sanitized — this is also exported standalone for callers that need
|
|
34
|
+
* to byte-cap raw, possibly multi-byte content without running it through
|
|
35
|
+
* the ASCII-collapsing `sanitizeName` pipeline).
|
|
36
|
+
*
|
|
37
|
+
* Walks the string one Unicode codepoint at a time (so a surrogate pair is
|
|
38
|
+
* never split mid-character) accumulating UTF-8 byte length, and stops
|
|
39
|
+
* BEFORE the codepoint that would exceed `maxBytes`. When the resulting hard
|
|
40
|
+
* cut lands within 8 bytes of a "-" character, prefers cutting at that "-"
|
|
41
|
+
* instead (word-boundary preference) — but only when doing so doesn't throw
|
|
42
|
+
* away the entire result. Pure string op; never throws.
|
|
43
|
+
*/
|
|
44
|
+
export function byteCap(input, maxBytes) {
|
|
45
|
+
if (maxBytes <= 0)
|
|
46
|
+
return "";
|
|
47
|
+
if (Buffer.byteLength(input, "utf-8") <= maxBytes)
|
|
48
|
+
return input;
|
|
49
|
+
let bytes = 0;
|
|
50
|
+
let cutIndex = input.length;
|
|
51
|
+
for (let i = 0; i < input.length;) {
|
|
52
|
+
const codePoint = input.codePointAt(i);
|
|
53
|
+
if (codePoint === undefined)
|
|
54
|
+
break;
|
|
55
|
+
const char = String.fromCodePoint(codePoint);
|
|
56
|
+
const charBytes = Buffer.byteLength(char, "utf-8");
|
|
57
|
+
if (bytes + charBytes > maxBytes) {
|
|
58
|
+
cutIndex = i;
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
61
|
+
bytes += charBytes;
|
|
62
|
+
i += char.length; // advance by 1 or 2 UTF-16 code units (surrogate pair)
|
|
63
|
+
}
|
|
64
|
+
const hardCut = input.slice(0, cutIndex);
|
|
65
|
+
// Word-boundary preference: if a "-" exists within the last 8 bytes of the
|
|
66
|
+
// hard cut, prefer cutting there so a slug doesn't end mid-word.
|
|
67
|
+
const windowStart = Math.max(0, hardCut.length - 8);
|
|
68
|
+
const window = hardCut.slice(windowStart);
|
|
69
|
+
const lastDash = window.lastIndexOf("-");
|
|
70
|
+
if (lastDash !== -1) {
|
|
71
|
+
const candidate = hardCut.slice(0, windowStart + lastDash);
|
|
72
|
+
if (candidate.length > 0)
|
|
73
|
+
return candidate;
|
|
74
|
+
}
|
|
75
|
+
return hardCut;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Sanitize free text into a v2-grammar-safe name component.
|
|
79
|
+
*
|
|
80
|
+
* lowercase → NFC → collapse any run of characters outside `[a-z0-9-]`
|
|
81
|
+
* (including runs of the separator "-" itself, e.g. a literal "--" in the
|
|
82
|
+
* input) into a single "-" → trim leading/trailing "-" → byte-cap →
|
|
83
|
+
* fallback "unnamed" when the result is empty.
|
|
84
|
+
*/
|
|
85
|
+
export function sanitizeName(input, maxBytes = 100) {
|
|
86
|
+
if (!input)
|
|
87
|
+
return "unnamed";
|
|
88
|
+
const collapsed = input
|
|
89
|
+
.toLowerCase()
|
|
90
|
+
.normalize("NFC")
|
|
91
|
+
.replace(/[^a-z0-9-]+/g, "-") // strip disallowed chars to "-"
|
|
92
|
+
.replace(/-{2,}/g, "-") // collapse any resulting (or pre-existing) "--" runs
|
|
93
|
+
.replace(/^-+|-+$/g, ""); // trim leading/trailing "-"
|
|
94
|
+
const capped = byteCap(collapsed, maxBytes).replace(/^-+|-+$/g, "");
|
|
95
|
+
return capped || "unnamed";
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=sanitize.js.map
|